From 7292a59593b4ea8c9a661578f567520ba88cf754 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 17 Jul 2012 18:04:44 +0200 Subject: [PATCH] systemd: stop udevd correctly --- modules.d/98systemd/dracut-pre-pivot.service | 2 +- modules.d/98systemd/initrd-switch-root.service | 1 + modules.d/98systemd/udevadm-cleanup-db.service | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules.d/98systemd/dracut-pre-pivot.service b/modules.d/98systemd/dracut-pre-pivot.service index 61257cf0..317b4769 100644 --- a/modules.d/98systemd/dracut-pre-pivot.service +++ b/modules.d/98systemd/dracut-pre-pivot.service @@ -16,7 +16,7 @@ ConditionPathExists=/etc/initrd-release [Service] Type=oneshot ExecStart=-/bin/dracut-pre-pivot -ExecStopPost=-/usr/bin/systemctl isolate initrd-switch-root.target +ExecStopPost=-/usr/bin/systemctl --no-block isolate initrd-switch-root.target StandardInput=null StandardOutput=syslog StandardError=syslog+console diff --git a/modules.d/98systemd/initrd-switch-root.service b/modules.d/98systemd/initrd-switch-root.service index 7d1a648f..b443eabf 100644 --- a/modules.d/98systemd/initrd-switch-root.service +++ b/modules.d/98systemd/initrd-switch-root.service @@ -22,3 +22,4 @@ ExecStopPost=-/bin/rm -f /run/initramfs/switch-root.conf StandardInput=null StandardOutput=null StandardError=null +KillMode=none diff --git a/modules.d/98systemd/udevadm-cleanup-db.service b/modules.d/98systemd/udevadm-cleanup-db.service index 368a0dd4..7e479461 100644 --- a/modules.d/98systemd/udevadm-cleanup-db.service +++ b/modules.d/98systemd/udevadm-cleanup-db.service @@ -10,7 +10,8 @@ Description=Cleanup udevd DB DefaultDependencies=no ConditionPathExists=/etc/initrd-release Conflicts=systemd-udevd.service systemd-udevd-control.socket systemd-udevd-kernel.socket -Before=initrd-switch-root.service +After=systemd-udevd.service systemd-udevd-control.socket systemd-udevd-kernel.socket +Before=initrd-switch-root.target [Service] Type=oneshot