]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
generator.c: systemd-fsck-root.service conflict with shutdown.target
authorHarald Hoyer <harald@redhat.com>
Mon, 26 Nov 2018 10:41:29 +0000 (11:41 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 26 Nov 2018 15:51:22 +0000 (16:51 +0100)
Otherwise a "reboot" or "poweroff" in the initramfs will have to wait
until systemd-fsck-root.service has completed, which might never happen
if the root device never shows up.

src/shared/generator.c

index e4a15f8b115c1c9f536d211960515744d50e508e..cf5f3d6bcbe2b4ffea6ae9c432518e5012451590 100644 (file)
@@ -105,6 +105,7 @@ static int write_fsck_sysroot_service(const char *dir, const char *what) {
                 "BindsTo=%3$s\n"
                 "After=initrd-root-device.target local-fs-pre.target %3$s\n"
                 "Before=shutdown.target\n"
+                "Conflicts=shutdown.target\n"
                 "\n"
                 "[Service]\n"
                 "Type=oneshot\n"