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

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

Browse Source 
- Fix duplicated rules when having layer3 interfaces (bnc#882714).
  Add 1046-fix-duplicated-rules-with-layer3-interfaces.patch

- Fix duplicated rules when having layer3 interfaces (bnc#882714).
  Add 1046-fix-duplicated-rules-with-layer3-interfaces.patch

OBS-URL: https://build.opensuse.org/request/show/239381
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=701
This commit is contained in:
Robert Milasan 2014-07-02 18:09:12 +00:00 committed by Git OBS Bridge
parent ac8a15a57d
commit 8cd49cbe66
5 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
1046-fix-duplicated-rules-with-layer3-interfaces.patch Normal file
View File

@ -0,0 +1,16 @@
Index: systemd-210/src/udev/rule_generator/write_net_rules
===================================================================
--- systemd-210.orig/src/udev/rule_generator/write_net_rules
+++ systemd-210/src/udev/rule_generator/write_net_rules
@@ -101,6 +101,11 @@ if [ "$MATCHDEVID" ]; then
fi
if [ "$MATCHID" ]; then
+ ID="$(find_all_rules 'KERNELS==' "$MATCHID")"
+ if [ "$ID" == "$MATCHID" ]; then
+ unlock_rules_file
+ exit 0
+ fi
match="$match, KERNELS==\"$MATCHID\""
fi

6
systemd-mini.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jul 2 18:06:32 UTC 2014 - rmilasan@suse.com
- Fix duplicated rules when having layer3 interfaces (bnc#882714).
Add 1046-fix-duplicated-rules-with-layer3-interfaces.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 1 12:19:27 UTC 2014 - werner@suse.de Tue Jul 1 12:19:27 UTC 2014 - werner@suse.de

3
systemd-mini.spec
View File

@ -719,6 +719,8 @@ Patch1043: 1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch
Patch1044: 1044-rules-update-qemu-hid-rules.patch Patch1044: 1044-rules-update-qemu-hid-rules.patch
# PATCH-FIX-UPSTREAM 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch # PATCH-FIX-UPSTREAM 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch
Patch1045: 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch Patch1045: 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch
# PATCH-FIX-SUSE 1046-fix-duplicated-rules-with-layer3-interfaces.patch (bnc#882714)
Patch1046: 1046-fix-duplicated-rules-with-layer3-interfaces.patch
%description %description
Systemd is a system and service manager, compatible with SysV and LSB Systemd is a system and service manager, compatible with SysV and LSB
@ -1237,6 +1239,7 @@ cp %{SOURCE7} m4/
%endif %endif
%patch1044 -p0 %patch1044 -p0
%patch1045 -p0 %patch1045 -p0
%patch1046 -p1
# ensure generate files are removed # ensure generate files are removed
rm -f units/emergency.service rm -f units/emergency.service

6
systemd.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jul 2 18:06:32 UTC 2014 - rmilasan@suse.com
- Fix duplicated rules when having layer3 interfaces (bnc#882714).
Add 1046-fix-duplicated-rules-with-layer3-interfaces.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 1 12:19:27 UTC 2014 - werner@suse.de Tue Jul 1 12:19:27 UTC 2014 - werner@suse.de

3
systemd.spec
View File

@ -714,6 +714,8 @@ Patch1043: 1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch
Patch1044: 1044-rules-update-qemu-hid-rules.patch Patch1044: 1044-rules-update-qemu-hid-rules.patch
# PATCH-FIX-UPSTREAM 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch # PATCH-FIX-UPSTREAM 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch
Patch1045: 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch Patch1045: 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch
# PATCH-FIX-SUSE 1046-fix-duplicated-rules-with-layer3-interfaces.patch (bnc#882714)
Patch1046: 1046-fix-duplicated-rules-with-layer3-interfaces.patch
%description %description
Systemd is a system and service manager, compatible with SysV and LSB Systemd is a system and service manager, compatible with SysV and LSB
@ -1232,6 +1234,7 @@ cp %{SOURCE7} m4/
%endif %endif
%patch1044 -p0 %patch1044 -p0
%patch1045 -p0 %patch1045 -p0
%patch1046 -p1
# ensure generate files are removed # ensure generate files are removed
rm -f units/emergency.service rm -f units/emergency.service