9fc3254595
- Update of patch 0001-detect-s390-virt.patch (bnc#880438) - Shut up stupid check scripts crying for not mentioned systemd-mini-rpmlintrc - Add upstream patchs 0001-core-use-correct-format-string-for-UIDs.patch 0002-core-transaction-fix-cycle-break-attempts-outside-tr.patch 0003-fsck-consider-a-fsck-implementation-linked-to-bin-tr.patch - Add upstream patch 0001-units-order-network-online.target-after-network.targ.patch to make sure that etwork-online.target follows network.target - 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 - Add upstream patches 0001-vconsole-also-copy-character-maps-not-just-fonts-fro.patch 0002-core-make-sure-Environment-fields-passed-in-for-tran.patch 0003-core-You-can-not-put-the-cached-result-of-use_smack-.patch 0004-cryptsetup-don-t-add-unit-dependency-on-dev-null-dev.patch 0005-man-fix-path-in-crypttab-5.patch - Add upstream patch 1039-udevadm-settle-fixed-return-code-for-empty-queue.patch it fixes udevadm settle exit code which may had roken dracut scripts (bnc#884271 comment#18) - Temporary disable patch 1022 (bnc#884271 and bnc#882714). OBS-URL: https://build.opensuse.org/request/show/238853 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=190
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}=""
|