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

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=673
This commit is contained in:
Dr. Werner Fink 2014-06-12 12:30:27 +00:00 committed by Git OBS Bridge
parent 348c8e2780
commit e6e0da555b
5 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
1035-99-systemd.rules-Ignore-devices-with-SYSTEMD_READY-0.patch Normal file
View File

@ -0,0 +1,32 @@
From c9af1be90db5a29ac86605c67bc2bb4bc5780520 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Thu, 12 Jun 2014 12:25:03 +0200
Subject: [PATCH] 99-systemd.rules: Ignore devices with 'SYSTEMD_READY=0'
Whenever a rule sets 'SYSTEMD_READY=0' it tries to indicate
that systemd should ignore this device. So we should not
set the 'systemd' tag in these cases; otherwise systemd
will pick up the device.
References: bnc#881942
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
rules/99-systemd.rules.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
index db72373..11ee262 100644
--- a/rules/99-systemd.rules.in
+++ b/rules/99-systemd.rules.in
@@ -11,6 +11,7 @@ SUBSYSTEM=="tty", KERNEL=="tty[a-zA-Z]*|hvc*|xvc*|hvsi*|ttysclp*|sclp_line*|3270
KERNEL=="vport*", TAG+="systemd"
+SUBSYSTEM=="block", KERNEL!="ram*", ENV{SYSTEMD_READY}=="0", GOTO="systemd_end"
SUBSYSTEM=="block", KERNEL!="ram*", TAG+="systemd"
SUBSYSTEM=="block", KERNEL!="ram*", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0"
--
1.8.4.5

8
systemd-mini.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Jun 12 12:14:11 UTC 2014 - werner@suse.de
- Add patch
1035-99-systemd.rules-Ignore-devices-with-SYSTEMD_READY-0.patch
from Hannes Reinecke to avoid a race condition between variable
'SYSTEMD_READY=0' and 'systemd' tag within udev rules (bnc#881942)
-------------------------------------------------------------------
Thu Jun 12 09:40:54 UTC 2014 - werner@suse.de

3
systemd-mini.spec
View File

@ -633,6 +633,8 @@ Patch1032: 1032-udev-guard-REREADPT-by-exclusive-lock-instead-of-O_E.patch
Patch1033: 1033-udev-really-exclude-device-mapper-from-block-device.patch
# PATCH-FIX-UPSTREAM 1034-udev-check-the-return-value-from-udev_enumerate_scan.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
%description
Systemd is a system and service manager, compatible with SysV and LSB
@ -1105,6 +1107,7 @@ cp %{SOURCE7} m4/
%patch1032 -p1
%patch1033 -p1
%patch1034 -p1
%patch1035 -p1
# ensure generate files are removed
rm -f units/emergency.service

8
systemd.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Jun 12 12:14:11 UTC 2014 - werner@suse.de
- Add patch
1035-99-systemd.rules-Ignore-devices-with-SYSTEMD_READY-0.patch
from Hannes Reinecke to avoid a race condition between variable
'SYSTEMD_READY=0' and 'systemd' tag within udev rules (bnc#881942)
-------------------------------------------------------------------
Thu Jun 12 09:40:54 UTC 2014 - werner@suse.de

3
systemd.spec
View File

@ -628,6 +628,8 @@ Patch1032: 1032-udev-guard-REREADPT-by-exclusive-lock-instead-of-O_E.patch
Patch1033: 1033-udev-really-exclude-device-mapper-from-block-device.patch
# PATCH-FIX-UPSTREAM 1034-udev-check-the-return-value-from-udev_enumerate_scan.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
%description
Systemd is a system and service manager, compatible with SysV and LSB
@ -1100,6 +1102,7 @@ cp %{SOURCE7} m4/
%patch1032 -p1
%patch1033 -p1
%patch1034 -p1
%patch1035 -p1
# ensure generate files are removed
rm -f units/emergency.service