dirkmueller/systemd
SHA256
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- rules: re-enable dev_id conditionally in persistent rules

Browse Source 
(bnc#884403 and bnc#882714).
  Add 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch 

- Temporary disable patch 1022 (bnc#884271 and bnc#882714).
- rules: re-enable dev_id conditionally in persistent rules
  (bnc#884403 and bnc#882714).
  Add 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch 

- Temporary disable patch 1022 (bnc#884271 and bnc#882714).

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=688
This commit is contained in:
Robert Milasan 2014-06-25 18:17:16 +00:00 committed by Git OBS Bridge
parent ee6ffb5583
commit 413937e29e
5 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
1040-re-enable-dev_id-conditionally-in-persistent-rules.patch Normal file
View File

@ -0,0 +1,16 @@
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,8 +68,9 @@ ENV{MATCHADDR}=="e2:0c:0f:*", GOTO="glob
ENV{MATCHADDR}=="00:16:3e:*", GOTO="globally_administered_whitelist"
# match interface dev_id
-# disable due to bnc#882714
-# ATTR{dev_id}=="?*", ENV{MATCHDEVID}="$attr{dev_id}"
+# HACK: for s390x, if layer2 == 0, dont use dev_id
+ENV{LAYER2}="1", TEST=="device/layer2", ENV{LAYER2}="$attr{device/layer2}"
+ENV{LAYER2}!="0", ATTR{dev_id}=="?*", ENV{MATCHDEVID}="$attr{dev_id}"
# do not use "locally administered" MAC address
ENV{MATCHADDR}=="?[2367abef]:*", ENV{MATCHADDR}=""

9
systemd-mini.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jun 25 18:09:52 UTC 2014 - rmilasan@suse.com
- rules: re-enable dev_id conditionally in persistent rules
(bnc#884403 and bnc#882714).
Add 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch
-------------------------------------------------------------------
Wed Jun 25 17:27:55 UTC 2014 - werner@suse.de
@ -19,7 +26,7 @@ Wed Jun 25 17:06:07 UTC 2014 - werner@suse.de
-------------------------------------------------------------------
Wed Jun 25 14:12:52 UTC 2014 - werner@suse.de
- Temporary disable patch 1022 (bnc#884271 and bnc#882714
- Temporary disable patch 1022 (bnc#884271 and bnc#882714).
-------------------------------------------------------------------
Tue Jun 24 11:55:39 UTC 2014 - rmilasan@suse.com

3
systemd-mini.spec
View File

@ -682,6 +682,8 @@ Patch1037: 1037-udev-exclude-cd-dvd-from-block-device.patch
Patch1038: 1038-udev-fix-invalid-free-in-enable_name_policy.patch
# PATCH-FIX-UPSTREAM 1039-udevadm-settle-fixed-return-code-for-empty-queue.patch
Patch1039: 1039-udevadm-settle-fixed-return-code-for-empty-queue.patch
# PATCH-FIX-SUSE 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch (bnc#884403 and bnc#882714)
Patch1040: 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch
%description
Systemd is a system and service manager, compatible with SysV and LSB
@ -1185,6 +1187,7 @@ cp %{SOURCE7} m4/
%patch1039 -p0
%endif
%endif
%patch1040 -p1
# ensure generate files are removed
rm -f units/emergency.service

9
systemd.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jun 25 18:09:52 UTC 2014 - rmilasan@suse.com
- rules: re-enable dev_id conditionally in persistent rules
(bnc#884403 and bnc#882714).
Add 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch
-------------------------------------------------------------------
Wed Jun 25 17:27:55 UTC 2014 - werner@suse.de
@ -19,7 +26,7 @@ Wed Jun 25 17:06:07 UTC 2014 - werner@suse.de
-------------------------------------------------------------------
Wed Jun 25 14:12:52 UTC 2014 - werner@suse.de
- Temporary disable patch 1022 (bnc#884271 and bnc#882714
- Temporary disable patch 1022 (bnc#884271 and bnc#882714).
-------------------------------------------------------------------
Tue Jun 24 11:55:39 UTC 2014 - rmilasan@suse.com

3
systemd.spec
View File

@ -677,6 +677,8 @@ Patch1037: 1037-udev-exclude-cd-dvd-from-block-device.patch
Patch1038: 1038-udev-fix-invalid-free-in-enable_name_policy.patch
# PATCH-FIX-UPSTREAM 1039-udevadm-settle-fixed-return-code-for-empty-queue.patch
Patch1039: 1039-udevadm-settle-fixed-return-code-for-empty-queue.patch
# PATCH-FIX-SUSE 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch (bnc#884403 and bnc#882714)
Patch1040: 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch
%description
Systemd is a system and service manager, compatible with SysV and LSB
@ -1180,6 +1182,7 @@ cp %{SOURCE7} m4/
%patch1039 -p0
%endif
%endif
%patch1040 -p1
# ensure generate files are removed
rm -f units/emergency.service