From 49fa4f55deabb159d4a56cb55d6c86857a4c712c1ef503923d28b5573fda614b Mon Sep 17 00:00:00 2001 From: Robert Milasan Date: Tue, 15 Jul 2014 12:33:30 +0000 Subject: [PATCH] Accepting request 241066 from home:rmilasan:branches:Base:System - Only rename SRIOV-VF devices if device name start with eth (bnc#885232). Add 1050-only-rename-SRIOV-VF-devices-when-name-starts-with-eth.patch - Only rename SRIOV-VF devices if device name start with eth (bnc#885232). Add 1050-only-rename-SRIOV-VF-devices-when-name-starts-with-eth.patch OBS-URL: https://build.opensuse.org/request/show/241066 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=718 --- ...-SRIOV-VF-devices-when-name-starts-with-eth.patch | 12 ++++++++++++ systemd-mini.changes | 6 ++++++ systemd-mini.spec | 3 +++ systemd.changes | 6 ++++++ systemd.spec | 3 +++ 5 files changed, 30 insertions(+) create mode 100644 1050-only-rename-SRIOV-VF-devices-when-name-starts-with-eth.patch diff --git a/1050-only-rename-SRIOV-VF-devices-when-name-starts-with-eth.patch b/1050-only-rename-SRIOV-VF-devices-when-name-starts-with-eth.patch new file mode 100644 index 00000000..5a89f11c --- /dev/null +++ b/1050-only-rename-SRIOV-VF-devices-when-name-starts-with-eth.patch @@ -0,0 +1,12 @@ +Index: systemd-210/src/udev/rule_generator/76-net-sriov-names.rules +=================================================================== +--- systemd-210.orig/src/udev/rule_generator/76-net-sriov-names.rules ++++ systemd-210/src/udev/rule_generator/76-net-sriov-names.rules +@@ -4,6 +4,7 @@ + + ACTION=="remove", GOTO="net-sriov-names_end" + SUBSYSTEM!="net", GOTO="net-sriov-names_end" ++KERNEL!="eth*", GOTO="net-sriov-names_end" + + IMPORT{cmdline}="net.ifnames" + ENV{net.ifnames}=="1", GOTO="net-sriov-names_end" diff --git a/systemd-mini.changes b/systemd-mini.changes index 8b442b0c..49b84eb0 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 15 12:30:31 UTC 2014 - rmilasan@suse.com + +- Only rename SRIOV-VF devices if device name start with eth (bnc#885232). + Add 1050-only-rename-SRIOV-VF-devices-when-name-starts-with-eth.patch + ------------------------------------------------------------------- Tue Jul 15 07:39:40 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index 1bf3d7a8..4652a12c 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -800,6 +800,8 @@ Patch1047: 1047-udev-net_setup_link-builtin-should-print-the-reason-.patch Patch1048: 1048-udev-net_setup_link-add-a-bit-more-logging.patch # PATCH-FIX-UPSTREAM 1049-udev-link_config-ignore-errors-due-to-missing-MAC-ad.patch Patch1049: 1049-udev-link_config-ignore-errors-due-to-missing-MAC-ad.patch +# PATCH-FIX-SUSE 1050-only-rename-SRIOV-VF-devices-when-name-starts-with-eth.patch (bnc#885232) +Patch1050: 1050-only-rename-SRIOV-VF-devices-when-name-starts-with-eth.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1354,6 +1356,7 @@ cp %{SOURCE7} m4/ %patch1047 -p0 %patch1048 -p0 %patch1049 -p0 +%patch1050 -p1 # ensure generate files are removed rm -f units/emergency.service diff --git a/systemd.changes b/systemd.changes index 8b442b0c..49b84eb0 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 15 12:30:31 UTC 2014 - rmilasan@suse.com + +- Only rename SRIOV-VF devices if device name start with eth (bnc#885232). + Add 1050-only-rename-SRIOV-VF-devices-when-name-starts-with-eth.patch + ------------------------------------------------------------------- Tue Jul 15 07:39:40 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index cb9e3201..e9129035 100644 --- a/systemd.spec +++ b/systemd.spec @@ -795,6 +795,8 @@ Patch1047: 1047-udev-net_setup_link-builtin-should-print-the-reason-.patch Patch1048: 1048-udev-net_setup_link-add-a-bit-more-logging.patch # PATCH-FIX-UPSTREAM 1049-udev-link_config-ignore-errors-due-to-missing-MAC-ad.patch Patch1049: 1049-udev-link_config-ignore-errors-due-to-missing-MAC-ad.patch +# PATCH-FIX-SUSE 1050-only-rename-SRIOV-VF-devices-when-name-starts-with-eth.patch (bnc#885232) +Patch1050: 1050-only-rename-SRIOV-VF-devices-when-name-starts-with-eth.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1349,6 +1351,7 @@ cp %{SOURCE7} m4/ %patch1047 -p0 %patch1048 -p0 %patch1049 -p0 +%patch1050 -p1 # ensure generate files are removed rm -f units/emergency.service