From: Harald Hoyer <harald@redhat.com>
Date: Mon, 26 Nov 2018 10:41:29 +0000 (+0100)
Subject: generator.c: systemd-fsck-root.service conflict with shutdown.target
X-Git-Tag: v240~219
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e9322048b4615bcf9817a3e28fbfda621cecbad;p=thirdparty%2Fsystemd.git

generator.c: systemd-fsck-root.service conflict with shutdown.target

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.
---

diff --git a/src/shared/generator.c b/src/shared/generator.c
index e4a15f8b115..cf5f3d6bcbe 100644
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -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"