rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

Accepting request 237758 from home:rmilasan:branches:Base:System

Browse Source 
- 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
This commit is contained in:
Dr. Werner Fink 2014-06-17 12:09:34 +00:00 committed by Git OBS Bridge
parent c94fde7ec2
commit 349ffaf425
5 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch Normal file
View File

@ -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}=""

8
systemd-mini.changes
View File

@ -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

9
systemd-mini.spec
View File

@ -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

8
systemd.changes
View File

@ -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

9
systemd.spec
View File

@ -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