forked from pool/systemd
.
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=747
This commit is contained in:
Dr. Werner Fink
Git OBS Bridge
parent
3a3b424a5d
commit
b549283dbc
1910
0007-hwdb-update.patch
Normal file
1910
0007-hwdb-update.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,32 @@
|
||||
From b5df2eabf3fdd3e1663bc4c948812472084f3e96 Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Wells <wellsie1116@gmail.com>
|
||||
Date: Thu, 31 Jul 2014 17:38:21 +0200
|
||||
Subject: [PATCH] rules: allow systemd to manage loop device partitions
|
||||
|
||||
SYSTEMD_READY is currently set to 0 for all loop devices (loop[0-9]*)
|
||||
that do not have a backing_file. Partitioned loop devices (ex. loop0p1),
|
||||
however, are matched by this rule and excluded by systemd even though
|
||||
they are active devices.
|
||||
|
||||
This change adds an additional check to the rule, ensuring that only
|
||||
top level loop devices (loop[0-9]+$) are excluded from systemd.
|
||||
---
|
||||
rules/99-systemd.rules.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git rules/99-systemd.rules.in rules/99-systemd.rules.in
|
||||
index c3ef81b..aa435c4 100644
|
||||
--- rules/99-systemd.rules.in
|
||||
+++ rules/99-systemd.rules.in
|
||||
@@ -23,7 +23,7 @@ SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", TEST!="md/array_state",
|
||||
SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0"
|
||||
|
||||
# Ignore loop devices that don't have any file attached
|
||||
-SUBSYSTEM=="block", KERNEL=="loop[0-9]*", TEST!="loop/backing_file", ENV{SYSTEMD_READY}="0"
|
||||
+SUBSYSTEM=="block", KERNEL=="loop[0-9]*", ENV{DEVTYPE}=="disk", TEST!="loop/backing_file", ENV{SYSTEMD_READY}="0"
|
||||
|
||||
# Ignore nbd devices in the "add" event, with "change" the nbd is ready
|
||||
ACTION=="add", SUBSYSTEM=="block", KERNEL=="nbd*", ENV{SYSTEMD_READY}="0"
|
||||
--
|
||||
1.7.9.2
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 1 09:53:30 UTC 2014 - werner@suse.de
|
||||
|
||||
- Add upstream patches
|
||||
0007-hwdb-update.patch
|
||||
1061-rules-allow-systemd-to-manage-loop-device-partitions.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 31 07:55:47 UTC 2014 - rmilasan@suse.com
|
||||
|
||||
|
||||
@ -759,6 +759,8 @@ Patch364: 0002-keymap-Add-microphone-mute-keymap-for-Dell-Latitude.patch
|
||||
Patch365: 0003-keymap-Annotate-all-micmute-workarounds.patch
|
||||
# PATCH-FIX-SUSE Provide the /var/lock/subsys at start (bnc#889357)
|
||||
Patch366: tomcat6-var-lock-subsys-legacy.patch
|
||||
# PATCH-FIX-UPSTREAM added at 2014/08/01
|
||||
Patch367: 0007-hwdb-update.patch
|
||||
|
||||
# UDEV PATCHES
|
||||
# ============
|
||||
@ -886,6 +888,8 @@ Patch1058: 1058-udev-unify-event-timeout-handling.patch
|
||||
Patch1059: 1059-udev-fixup-commit-dd5eddd28a74a49607a8fffcaf960040db.patch
|
||||
# PATCH-FIX-SUSE 1060-udev-use-device-mapper-target-name-for-btrfs-device-ready.patch
|
||||
Patch1060: 1060-udev-use-device-mapper-target-name-for-btrfs-device-ready.patch
|
||||
# PATCH-FIX-UPSTREAM 1061-rules-allow-systemd-to-manage-loop-device-partitions.patch
|
||||
Patch1061: 1061-rules-allow-systemd-to-manage-loop-device-partitions.patch
|
||||
|
||||
%description
|
||||
Systemd is a system and service manager, compatible with SysV and LSB
|
||||
@ -1411,6 +1415,7 @@ cp %{SOURCE7} m4/
|
||||
%patch364 -p0
|
||||
%patch365 -p0
|
||||
%patch366 -p1
|
||||
%patch367 -p0
|
||||
|
||||
# udev patches
|
||||
%patch1001 -p1
|
||||
@ -1494,6 +1499,7 @@ cp %{SOURCE7} m4/
|
||||
%endif
|
||||
%patch1059 -p0
|
||||
%patch1060 -p1
|
||||
%patch1061 -p0
|
||||
|
||||
# ensure generate files are removed
|
||||
rm -f units/emergency.service
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 1 09:53:30 UTC 2014 - werner@suse.de
|
||||
|
||||
- Add upstream patches
|
||||
0007-hwdb-update.patch
|
||||
1061-rules-allow-systemd-to-manage-loop-device-partitions.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 31 07:55:47 UTC 2014 - rmilasan@suse.com
|
||||
|
||||
|
||||
@ -754,6 +754,8 @@ Patch364: 0002-keymap-Add-microphone-mute-keymap-for-Dell-Latitude.patch
|
||||
Patch365: 0003-keymap-Annotate-all-micmute-workarounds.patch
|
||||
# PATCH-FIX-SUSE Provide the /var/lock/subsys at start (bnc#889357)
|
||||
Patch366: tomcat6-var-lock-subsys-legacy.patch
|
||||
# PATCH-FIX-UPSTREAM added at 2014/08/01
|
||||
Patch367: 0007-hwdb-update.patch
|
||||
|
||||
# UDEV PATCHES
|
||||
# ============
|
||||
@ -881,6 +883,8 @@ Patch1058: 1058-udev-unify-event-timeout-handling.patch
|
||||
Patch1059: 1059-udev-fixup-commit-dd5eddd28a74a49607a8fffcaf960040db.patch
|
||||
# PATCH-FIX-SUSE 1060-udev-use-device-mapper-target-name-for-btrfs-device-ready.patch
|
||||
Patch1060: 1060-udev-use-device-mapper-target-name-for-btrfs-device-ready.patch
|
||||
# PATCH-FIX-UPSTREAM 1061-rules-allow-systemd-to-manage-loop-device-partitions.patch
|
||||
Patch1061: 1061-rules-allow-systemd-to-manage-loop-device-partitions.patch
|
||||
|
||||
%description
|
||||
Systemd is a system and service manager, compatible with SysV and LSB
|
||||
@ -1406,6 +1410,7 @@ cp %{SOURCE7} m4/
|
||||
%patch364 -p0
|
||||
%patch365 -p0
|
||||
%patch366 -p1
|
||||
%patch367 -p0
|
||||
|
||||
# udev patches
|
||||
%patch1001 -p1
|
||||
@ -1489,6 +1494,7 @@ cp %{SOURCE7} m4/
|
||||
%endif
|
||||
%patch1059 -p0
|
||||
%patch1060 -p1
|
||||
%patch1061 -p0
|
||||
|
||||
# ensure generate files are removed
|
||||
rm -f units/emergency.service
|
||||
|
||||
Loading…
Reference in New Issue
Block a user