From eac2d4db72fc2f1087b07cd5c8a997cd2418ede0f155c7700335175a12ea61ed Mon Sep 17 00:00:00 2001 From: Robert Milasan Date: Wed, 2 Jul 2014 18:09:12 +0000 Subject: [PATCH] Accepting request 239381 from home:rmilasan:branches:Base:System - Fix duplicated rules when having layer3 interfaces (bnc#882714). Add 1046-fix-duplicated-rules-with-layer3-interfaces.patch - Fix duplicated rules when having layer3 interfaces (bnc#882714). Add 1046-fix-duplicated-rules-with-layer3-interfaces.patch OBS-URL: https://build.opensuse.org/request/show/239381 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=701 --- ...duplicated-rules-with-layer3-interfaces.patch | 16 ++++++++++++++++ systemd-mini.changes | 6 ++++++ systemd-mini.spec | 3 +++ systemd.changes | 6 ++++++ systemd.spec | 3 +++ 5 files changed, 34 insertions(+) create mode 100644 1046-fix-duplicated-rules-with-layer3-interfaces.patch diff --git a/1046-fix-duplicated-rules-with-layer3-interfaces.patch b/1046-fix-duplicated-rules-with-layer3-interfaces.patch new file mode 100644 index 00000000..47445a83 --- /dev/null +++ b/1046-fix-duplicated-rules-with-layer3-interfaces.patch @@ -0,0 +1,16 @@ +Index: systemd-210/src/udev/rule_generator/write_net_rules +=================================================================== +--- systemd-210.orig/src/udev/rule_generator/write_net_rules ++++ systemd-210/src/udev/rule_generator/write_net_rules +@@ -101,6 +101,11 @@ if [ "$MATCHDEVID" ]; then + fi + + if [ "$MATCHID" ]; then ++ ID="$(find_all_rules 'KERNELS==' "$MATCHID")" ++ if [ "$ID" == "$MATCHID" ]; then ++ unlock_rules_file ++ exit 0 ++ fi + match="$match, KERNELS==\"$MATCHID\"" + fi + diff --git a/systemd-mini.changes b/systemd-mini.changes index 72a94b11..0621cdac 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 2 18:06:32 UTC 2014 - rmilasan@suse.com + +- Fix duplicated rules when having layer3 interfaces (bnc#882714). + Add 1046-fix-duplicated-rules-with-layer3-interfaces.patch + ------------------------------------------------------------------- Tue Jul 1 12:19:27 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index 04ba9367..5c2463dd 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -719,6 +719,8 @@ Patch1043: 1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch Patch1044: 1044-rules-update-qemu-hid-rules.patch # PATCH-FIX-UPSTREAM 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch Patch1045: 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch +# PATCH-FIX-SUSE 1046-fix-duplicated-rules-with-layer3-interfaces.patch (bnc#882714) +Patch1046: 1046-fix-duplicated-rules-with-layer3-interfaces.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1237,6 +1239,7 @@ cp %{SOURCE7} m4/ %endif %patch1044 -p0 %patch1045 -p0 +%patch1046 -p1 # ensure generate files are removed rm -f units/emergency.service diff --git a/systemd.changes b/systemd.changes index 72a94b11..0621cdac 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 2 18:06:32 UTC 2014 - rmilasan@suse.com + +- Fix duplicated rules when having layer3 interfaces (bnc#882714). + Add 1046-fix-duplicated-rules-with-layer3-interfaces.patch + ------------------------------------------------------------------- Tue Jul 1 12:19:27 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index 6584e032..5aefa075 100644 --- a/systemd.spec +++ b/systemd.spec @@ -714,6 +714,8 @@ Patch1043: 1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch Patch1044: 1044-rules-update-qemu-hid-rules.patch # PATCH-FIX-UPSTREAM 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch Patch1045: 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch +# PATCH-FIX-SUSE 1046-fix-duplicated-rules-with-layer3-interfaces.patch (bnc#882714) +Patch1046: 1046-fix-duplicated-rules-with-layer3-interfaces.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1232,6 +1234,7 @@ cp %{SOURCE7} m4/ %endif %patch1044 -p0 %patch1045 -p0 +%patch1046 -p1 # ensure generate files are removed rm -f units/emergency.service