From 6bbd539e5e7226ff1e2574e42c8bc821b68cfa19 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 19 Dec 2019 13:17:31 +0100 Subject: [PATCH] cryptsetup-generator: order after cryptsetup-pre.target unconditionally --- src/cryptsetup/cryptsetup-generator.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c index eaa3af6298a..02b2cae5c00 100644 --- a/src/cryptsetup/cryptsetup-generator.c +++ b/src/cryptsetup/cryptsetup-generator.c @@ -299,9 +299,11 @@ static int create_disk( "SourcePath=%s\n" "DefaultDependencies=no\n" "IgnoreOnIsolate=true\n" - "After=%s\n", - arg_crypttab, - netdev ? "remote-fs-pre.target" : "cryptsetup-pre.target"); + "After=cryptsetup-pre.target\n", + arg_crypttab); + + if (netdev) + fprintf(f, "After=remote-fs-pre.target\n"); /* If initrd takes care of attaching the disk then it should also detach it during shutdown. */ if (!attach_in_initrd) -- 2.47.3