diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-10-27 13:26:01 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-10-27 13:36:22 +0100 |
| commit | 6bdcb72086b681a0d42521169fdadb65ef2ac539 (patch) | |
| tree | c0b45576efe3afe073fbc9437b9a6429f6f22caa /src/cryptsetup/cryptsetup-generator.c | |
| parent | d5816b6138be788f3d3ea72359bb28dc239c3235 (diff) | |
| download | systemd-6bdcb72086b681a0d42521169fdadb65ef2ac539.tar.gz | |
Revert "units: add initrd-cryptsetup.target"
This reverts commit 6c5496c492a8d74e54d22bf8824160cab1e63c10.
sysinit.target is shared between the initrd and the host system. Pulling in
initrd-cryptsetup.target into sysinit.target causes the following warning at
boot:
Oct 27 10:42:30 workstation-uefi systemd[1]: initrd-cryptsetup.target: Starting requested but asserts failed.
Oct 27 10:42:30 workstation-uefi systemd[1]: Assertion failed for initrd-cryptsetup.target.
Diffstat (limited to 'src/cryptsetup/cryptsetup-generator.c')
| -rw-r--r-- | src/cryptsetup/cryptsetup-generator.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c index 13e9f3aedd..df589ec3e4 100644 --- a/src/cryptsetup/cryptsetup-generator.c +++ b/src/cryptsetup/cryptsetup-generator.c @@ -455,16 +455,10 @@ static int create_disk( } } - const char *target; - if (in_initrd()) - target = "initrd-cryptsetup.target"; - else if (netdev) - target = "remote-cryptsetup.target"; - else - target = "cryptsetup.target"; - if (!nofail) - fprintf(f, "Before=%s\n", target); + fprintf(f, + "Before=%s\n", + netdev ? "remote-cryptsetup.target" : "cryptsetup.target"); if (password && !keydev) { r = print_dependencies(f, password); @@ -527,7 +521,8 @@ static int create_disk( return log_error_errno(r, "Failed to write unit file %s: %m", n); if (!noauto) { - r = generator_add_symlink(arg_dest, target, + r = generator_add_symlink(arg_dest, + netdev ? "remote-cryptsetup.target" : "cryptsetup.target", nofail ? "wants" : "requires", n); if (r < 0) return r; |