From 66d4f0d69b69c3d6df2ffcd035d4fa2ebcbfcdfce5fd182b927075697d014ed1 Mon Sep 17 00:00:00 2001 From: Robert Milasan Date: Thu, 17 Jul 2014 06:35:02 +0000 Subject: [PATCH] Accepting request 241288 from home:rmilasan:branches:Base:System - Check if NAME key has a value before going thru the rule (bnc#885232). Add 1051-check-if-NAME-has-a-value.patch - Check if NAME key has a value before going thru the rule (bnc#885232). Add 1051-check-if-NAME-has-a-value.patch OBS-URL: https://build.opensuse.org/request/show/241288 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=720 --- 1051-check-if-NAME-has-a-value.patch | 12 ++++++++++++ systemd-mini.changes | 6 ++++++ systemd-mini.spec | 3 +++ systemd.changes | 6 ++++++ systemd.spec | 3 +++ 5 files changed, 30 insertions(+) create mode 100644 1051-check-if-NAME-has-a-value.patch diff --git a/1051-check-if-NAME-has-a-value.patch b/1051-check-if-NAME-has-a-value.patch new file mode 100644 index 00000000..3ea5f800 --- /dev/null +++ b/1051-check-if-NAME-has-a-value.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 +@@ -5,6 +5,7 @@ + ACTION=="remove", GOTO="net-sriov-names_end" + SUBSYSTEM!="net", GOTO="net-sriov-names_end" + KERNEL!="eth*", GOTO="net-sriov-names_end" ++NAME=="?*", 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 49b84eb0..25040782 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 17 06:32:51 UTC 2014 - rmilasan@suse.com + +- Check if NAME key has a value before going thru the rule (bnc#885232). + Add 1051-check-if-NAME-has-a-value.patch + ------------------------------------------------------------------- Tue Jul 15 12:30:31 UTC 2014 - rmilasan@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 4652a12c..68f1b7c6 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -802,6 +802,8 @@ Patch1048: 1048-udev-net_setup_link-add-a-bit-more-logging.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 +# PATCH-FIX-SUSE 1051-check-if-NAME-has-a-value.patch (bnc#885232) +Patch1051: 1051-check-if-NAME-has-a-value.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1357,6 +1359,7 @@ cp %{SOURCE7} m4/ %patch1048 -p0 %patch1049 -p0 %patch1050 -p1 +%patch1051 -p1 # ensure generate files are removed rm -f units/emergency.service diff --git a/systemd.changes b/systemd.changes index 49b84eb0..25040782 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 17 06:32:51 UTC 2014 - rmilasan@suse.com + +- Check if NAME key has a value before going thru the rule (bnc#885232). + Add 1051-check-if-NAME-has-a-value.patch + ------------------------------------------------------------------- Tue Jul 15 12:30:31 UTC 2014 - rmilasan@suse.com diff --git a/systemd.spec b/systemd.spec index e9129035..e60e8003 100644 --- a/systemd.spec +++ b/systemd.spec @@ -797,6 +797,8 @@ Patch1048: 1048-udev-net_setup_link-add-a-bit-more-logging.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 +# PATCH-FIX-SUSE 1051-check-if-NAME-has-a-value.patch (bnc#885232) +Patch1051: 1051-check-if-NAME-has-a-value.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1352,6 +1354,7 @@ cp %{SOURCE7} m4/ %patch1048 -p0 %patch1049 -p0 %patch1050 -p1 +%patch1051 -p1 # ensure generate files are removed rm -f units/emergency.service