richardphibel / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
1ff636
From 09d583399bf41a61b9b3a96d9eefa51ad4219a6a Mon Sep 17 00:00:00 2001
1ff636
From: Lennart Poettering <lennart@poettering.net>
1ff636
Date: Fri, 3 Apr 2015 14:27:16 +0200
1ff636
Subject: [PATCH] units: move After=systemd-hwdb-update.service dependency from
1ff636
 udev to udev-trigger
1ff636
1ff636
Let's move the hwdb regeneration a bit later. Given that hwdb is
1ff636
non-essential it should be OK to allow udev to run without it until we
1ff636
do the full trigger.
1ff636
1ff636
http://lists.freedesktop.org/archives/systemd-devel/2015-April/030074.html
1ff636
(cherry picked from commit d8f0930eec248c2f54c85aa5029e1b3775c8dc75)
1ff636
1ff636
Cherry-picked from: 84a1e05
1ff636
Resolves: #1222517
1ff636
---
1ff636
 units/systemd-udev-trigger.service.in | 2 +-
1ff636
 units/systemd-udevd.service.in        | 2 +-
1ff636
 2 files changed, 2 insertions(+), 2 deletions(-)
1ff636
1ff636
diff --git a/units/systemd-udev-trigger.service.in b/units/systemd-udev-trigger.service.in
1ff636
index 0c33909..1e04d11 100644
1ff636
--- a/units/systemd-udev-trigger.service.in
1ff636
+++ b/units/systemd-udev-trigger.service.in
1ff636
@@ -10,7 +10,7 @@ Description=udev Coldplug all Devices
1ff636
 Documentation=man:udev(7) man:systemd-udevd.service(8)
1ff636
 DefaultDependencies=no
1ff636
 Wants=systemd-udevd.service
1ff636
-After=systemd-udevd-kernel.socket systemd-udevd-control.socket
1ff636
+After=systemd-udevd-kernel.socket systemd-udevd-control.socket systemd-hwdb-update.service
1ff636
 Before=sysinit.target
1ff636
 ConditionPathIsReadWrite=/sys
1ff636
 
1ff636
diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in
1ff636
index 2791f73..a133044 100644
1ff636
--- a/units/systemd-udevd.service.in
1ff636
+++ b/units/systemd-udevd.service.in
1ff636
@@ -10,7 +10,7 @@ Description=udev Kernel Device Manager
1ff636
 Documentation=man:systemd-udevd.service(8) man:udev(7)
1ff636
 DefaultDependencies=no
1ff636
 Wants=systemd-udevd-control.socket systemd-udevd-kernel.socket
1ff636
-After=systemd-udevd-control.socket systemd-udevd-kernel.socket systemd-hwdb-update.service systemd-sysusers.service
1ff636
+After=systemd-udevd-control.socket systemd-udevd-kernel.socket systemd-sysusers.service
1ff636
 Before=sysinit.target
1ff636
 ConditionPathIsReadWrite=/sys
1ff636