summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorDimitri John Ledkov <xnox@ubuntu.com>2019-12-13 23:22:51 +0000
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-12-17 21:38:11 +0100
commitf27bb6abd3b825034e0dde631ae3047128d2162d (patch)
tree3fef54826a23f8e003fb8d7e140a111a81a21e7f /units
parent3d864658ea0115820e2610c2618f6fee7b964ec1 (diff)
downloadsystemd-f27bb6abd3b825034e0dde631ae3047128d2162d.tar.gz
initrd: make udev cleanup service confict trigger and settle too
Otherwise, systemd-udev-trigger|settle.service that ran in the initrd may ramain active, and never re-run again from the system root. This is observed by forexample examining ESP with udevadm info, which in the initrd has all the ID_* variables, and none of them in fully booted system.
Diffstat (limited to 'units')
-rw-r--r--units/initrd-udevadm-cleanup-db.service.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/units/initrd-udevadm-cleanup-db.service.in b/units/initrd-udevadm-cleanup-db.service.in
index 5059605c27..09af690986 100644
--- a/units/initrd-udevadm-cleanup-db.service.in
+++ b/units/initrd-udevadm-cleanup-db.service.in
@@ -11,8 +11,8 @@
Description=Cleanup udevd DB
DefaultDependencies=no
ConditionPathExists=/etc/initrd-release
-Conflicts=systemd-udevd.service systemd-udevd-control.socket systemd-udevd-kernel.socket
-After=systemd-udevd.service systemd-udevd-control.socket systemd-udevd-kernel.socket
+Conflicts=systemd-udevd.service systemd-udevd-control.socket systemd-udevd-kernel.socket systemd-udev-trigger.service systemd-udev-settle.service
+After=systemd-udevd.service systemd-udevd-control.socket systemd-udevd-kernel.socket systemd-udev-trigger.service systemd-udev-settle.service
Before=initrd-switch-root.target
[Service]