From b64a7017c606c4c5c9ded301defaf64e70151855ee1f90ad2e570e600fbcc609 Mon Sep 17 00:00:00 2001 From: Robert Milasan Date: Fri, 26 Sep 2014 09:37:41 +0000 Subject: [PATCH] Accepting request 252434 from home:rmilasan:branches:Base:System - Drop renaming virtual interfaces in a guest (bnc#898432). Add 1088-drop-renaming-of-virtual-interfaces-in-guest.patch - Drop renaming virtual interfaces in a guest (bnc#898432). Add 1088-drop-renaming-of-virtual-interfaces-in-guest.patch OBS-URL: https://build.opensuse.org/request/show/252434 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=794 --- ...drop-renaming-of-virtual-interfaces-in-guest.patch | 11 +++++++++++ systemd-mini.changes | 6 ++++++ systemd-mini.spec | 3 +++ systemd.changes | 6 ++++++ systemd.spec | 3 +++ 5 files changed, 29 insertions(+) create mode 100644 1088-drop-renaming-of-virtual-interfaces-in-guest.patch diff --git a/1088-drop-renaming-of-virtual-interfaces-in-guest.patch b/1088-drop-renaming-of-virtual-interfaces-in-guest.patch new file mode 100644 index 00000000..a25861cd --- /dev/null +++ b/1088-drop-renaming-of-virtual-interfaces-in-guest.patch @@ -0,0 +1,11 @@ +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 +@@ -15,6 +15,5 @@ SUBSYSTEM=="net", SUBSYSTEMS=="pci", ACT + + # rename interface if needed + ENV{INTERFACE_NEW}=="?*", NAME="$env{INTERFACE_NEW}" +-ENV{INTERFACE_NEW}=="", DRIVERS=="cxgb4vf|igbvf|ixgbevf", NAME="vf$attr{ifindex}" + + LABEL="net-sriov-names_end" diff --git a/systemd-mini.changes b/systemd-mini.changes index e416dbc9..06227f72 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 26 09:34:22 UTC 2014 - rmilasan@suse.com + +- Drop renaming virtual interfaces in a guest (bnc#898432). + Add 1088-drop-renaming-of-virtual-interfaces-in-guest.patch + ------------------------------------------------------------------- Thu Sep 25 14:08:35 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index 97a884fd..08a09c44 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -1081,6 +1081,8 @@ Patch1085: 1085-udev-fix-typos.patch Patch1086: 1086-udevd-don-t-fail-if-run-udev-exists.patch # PATCH-FIX-SSUE 1087-infinit-timeout-for-kmod-loaded-modules.patch Patch1087: 1087-infinit-timeout-for-kmod-loaded-modules.patch +# PATCH-FIX-SSUE 1088-drop-renaming-of-virtual-interfaces-in-guest.patch (bnc#898432) +Patch1088: 1088-drop-renaming-of-virtual-interfaces-in-guest.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1796,6 +1798,7 @@ cp %{SOURCE7} m4/ %patch1085 -p0 %patch1086 -p0 %patch1087 -p0 +%patch1088 -p1 # remove patch backups find -name '*.orig' -exec rm -f '{}' \+ diff --git a/systemd.changes b/systemd.changes index e416dbc9..06227f72 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 26 09:34:22 UTC 2014 - rmilasan@suse.com + +- Drop renaming virtual interfaces in a guest (bnc#898432). + Add 1088-drop-renaming-of-virtual-interfaces-in-guest.patch + ------------------------------------------------------------------- Thu Sep 25 14:08:35 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index ba3c6d47..7980a8c4 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1076,6 +1076,8 @@ Patch1085: 1085-udev-fix-typos.patch Patch1086: 1086-udevd-don-t-fail-if-run-udev-exists.patch # PATCH-FIX-SSUE 1087-infinit-timeout-for-kmod-loaded-modules.patch Patch1087: 1087-infinit-timeout-for-kmod-loaded-modules.patch +# PATCH-FIX-SSUE 1088-drop-renaming-of-virtual-interfaces-in-guest.patch (bnc#898432) +Patch1088: 1088-drop-renaming-of-virtual-interfaces-in-guest.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1791,6 +1793,7 @@ cp %{SOURCE7} m4/ %patch1085 -p0 %patch1086 -p0 %patch1087 -p0 +%patch1088 -p1 # remove patch backups find -name '*.orig' -exec rm -f '{}' \+