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