forked from pool/systemd
91a7764429
- 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). - 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/request/show/238695 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=688
17 lines
841 B
Diff
17 lines
841 B
Diff
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}=""
|