From 349ffaf425923c7c2089073e54603b64e5910b470f02230f8c926aa0d6bff609 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 17 Jun 2014 12:09:34 +0000 Subject: [PATCH] Accepting request 237758 from home:rmilasan:branches:Base:System - rules: disable usage of dev_id in persistent rules (bnc#882714). add: 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch - Disable patch (bnc#882714). 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch - rules: disable usage of dev_id in persistent rules (bnc#882714). add: 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch - Disable patch (bnc#882714). 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch OBS-URL: https://build.opensuse.org/request/show/237758 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=674 --- ...sable-usage-of-dev_id-in-persistent-rules.patch | 14 ++++++++++++++ systemd-mini.changes | 8 ++++++++ systemd-mini.spec | 9 +++++++-- systemd.changes | 8 ++++++++ systemd.spec | 9 +++++++-- 5 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch diff --git a/1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch b/1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch new file mode 100644 index 00000000..d26c49c0 --- /dev/null +++ b/1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch @@ -0,0 +1,14 @@ +Index: systemd-210/src/udev/rule_generator/75-persistent-net-generator.rules +=================================================================== +--- systemd-210.orig/src/udev/rule_generator/75-persistent-net-generator.rules ++++ systemd-210/src/udev/rule_generator/75-persistent-net-generator.rules +@@ -68,7 +68,8 @@ ENV{MATCHADDR}=="e2:0c:0f:*", GOTO="glob + ENV{MATCHADDR}=="00:16:3e:*", GOTO="globally_administered_whitelist" + + # match interface dev_id +-ATTR{dev_id}=="?*", ENV{MATCHDEVID}="$attr{dev_id}" ++# disable due to bnc#882714 ++# ATTR{dev_id}=="?*", ENV{MATCHDEVID}="$attr{dev_id}" + + # do not use "locally administered" MAC address + ENV{MATCHADDR}=="?[2367abef]:*", ENV{MATCHADDR}="" diff --git a/systemd-mini.changes b/systemd-mini.changes index 4cacd7ea..e31567ba 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jun 17 11:43:23 UTC 2014 - rmilasan@suse.com + +- rules: disable usage of dev_id in persistent rules (bnc#882714). + add: 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch +- Disable patch (bnc#882714). + 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch + ------------------------------------------------------------------- Thu Jun 12 12:14:11 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index 70b36178..806b9150 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -608,7 +608,8 @@ Patch1020: 1020-udev-keyboard-also-hook-into-change-events.patch # PATCH-FIX-SUSE 1021-udev-re-add-persistent-net-rules.patch Patch1021: 1021-udev-re-add-persistent-net-rules.patch # PATCH-FIX-UPSTREAM 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch -Patch1022: 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch +# disable due to bnc#882714 +# Patch1022: 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch # PATCH-FIX-UPSTREAM added at 2014/06/03 Patch1023: 1023-udev-builtin-keyboard-do-tell-on-which-device-EVIOCS.patch # PATCH-FIX-UPSTREAM added at 2014/06/03 @@ -635,6 +636,8 @@ Patch1033: 1033-udev-really-exclude-device-mapper-from-block-device.patch Patch1034: 1034-udev-check-the-return-value-from-udev_enumerate_scan.patch # PATCH-FIX-SUSE 1035-99-systemd.rules-Ignore-devices-with-SYSTEMD_READY-0.patch Patch1035: 1035-99-systemd.rules-Ignore-devices-with-SYSTEMD_READY-0.patch +# PATCH-FIX-SUSE 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch +Patch1036: 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1094,7 +1097,8 @@ cp %{SOURCE7} m4/ %patch1019 -p0 %patch1020 -p0 %patch1021 -p1 -%patch1022 -p1 +# disable due to bnc#882714 +# %patch1022 -p1 %patch1023 -p0 %patch1024 -p0 %patch1025 -p1 @@ -1108,6 +1112,7 @@ cp %{SOURCE7} m4/ %patch1033 -p1 %patch1034 -p1 %patch1035 -p1 +%patch1036 -p1 # ensure generate files are removed rm -f units/emergency.service diff --git a/systemd.changes b/systemd.changes index 4cacd7ea..e31567ba 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jun 17 11:43:23 UTC 2014 - rmilasan@suse.com + +- rules: disable usage of dev_id in persistent rules (bnc#882714). + add: 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch +- Disable patch (bnc#882714). + 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch + ------------------------------------------------------------------- Thu Jun 12 12:14:11 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index b86edc92..43d29325 100644 --- a/systemd.spec +++ b/systemd.spec @@ -603,7 +603,8 @@ Patch1020: 1020-udev-keyboard-also-hook-into-change-events.patch # PATCH-FIX-SUSE 1021-udev-re-add-persistent-net-rules.patch Patch1021: 1021-udev-re-add-persistent-net-rules.patch # PATCH-FIX-UPSTREAM 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch -Patch1022: 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch +# disable due to bnc#882714 +# Patch1022: 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch # PATCH-FIX-UPSTREAM added at 2014/06/03 Patch1023: 1023-udev-builtin-keyboard-do-tell-on-which-device-EVIOCS.patch # PATCH-FIX-UPSTREAM added at 2014/06/03 @@ -630,6 +631,8 @@ Patch1033: 1033-udev-really-exclude-device-mapper-from-block-device.patch Patch1034: 1034-udev-check-the-return-value-from-udev_enumerate_scan.patch # PATCH-FIX-SUSE 1035-99-systemd.rules-Ignore-devices-with-SYSTEMD_READY-0.patch Patch1035: 1035-99-systemd.rules-Ignore-devices-with-SYSTEMD_READY-0.patch +# PATCH-FIX-SUSE 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch +Patch1036: 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1089,7 +1092,8 @@ cp %{SOURCE7} m4/ %patch1019 -p0 %patch1020 -p0 %patch1021 -p1 -%patch1022 -p1 +# disable due to bnc#882714 +# %patch1022 -p1 %patch1023 -p0 %patch1024 -p0 %patch1025 -p1 @@ -1103,6 +1107,7 @@ cp %{SOURCE7} m4/ %patch1033 -p1 %patch1034 -p1 %patch1035 -p1 +%patch1036 -p1 # ensure generate files are removed rm -f units/emergency.service