summaryrefslogtreecommitdiff
path: root/src/shared/generator.c
diff options
context:
space:
mode:
authorHarald Hoyer <harald@redhat.com>2018-11-26 11:41:29 +0100
committerLennart Poettering <lennart@poettering.net>2018-11-26 16:51:22 +0100
commit4e9322048b4615bcf9817a3e28fbfda621cecbad (patch)
tree0a8b94dafb65c0dcd91398d2d6c5d8fafc21479f /src/shared/generator.c
parent938dbb292ac6dcc49c53da58cfd006ec288beca2 (diff)
downloadsystemd-4e9322048b4615bcf9817a3e28fbfda621cecbad.tar.gz
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.
Diffstat (limited to 'src/shared/generator.c')
-rw-r--r--src/shared/generator.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/shared/generator.c b/src/shared/generator.c
index e4a15f8b11..cf5f3d6bcb 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"