diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-10-28 18:00:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-28 18:00:04 +0100 |
| commit | 32c3a623cecbe6333a83867f3ccb0335bebc07c0 (patch) | |
| tree | 79e862e23836c32078e7adbdbf04c71fd00de48d /units | |
| parent | 48625dc437589d328de09887d1ebc360233f5acf (diff) | |
| parent | e921ebb57e0bc823ac167801cb5dd5f119f5d585 (diff) | |
| download | systemd-32c3a623cecbe6333a83867f3ccb0335bebc07c0.tar.gz | |
Merge pull request #17467 from keszybz/unconditionally-pull-in-cryptsetup-remote
Unconditionally pull in cryptsetup-remote.target in the initramfs
Diffstat (limited to 'units')
| -rw-r--r-- | units/initrd-cryptsetup.target | 17 | ||||
| -rw-r--r-- | units/meson.build | 9 |
2 files changed, 4 insertions, 22 deletions
diff --git a/units/initrd-cryptsetup.target b/units/initrd-cryptsetup.target deleted file mode 100644 index 2a2938c895..0000000000 --- a/units/initrd-cryptsetup.target +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1+ -# -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -[Unit] -Description=Initrd Encrypted Volumes -Documentation=man:systemd.special(7) -OnFailure=emergency.target -OnFailureJobMode=replace-irreversibly -AssertPathExists=/etc/initrd-release -DefaultDependencies=no -Conflicts=shutdown.target diff --git a/units/meson.build b/units/meson.build index a55e717868..2f09590736 100644 --- a/units/meson.build +++ b/units/meson.build @@ -22,14 +22,12 @@ units = [ 'multi-user.target.wants/'], ['getty-pre.target', ''], ['graphical.target', '', - (with_runlevels ? 'runlevel5.target default.target' : 'default.target')], + 'default.target' + (with_runlevels ? ' runlevel5.target' : '')], ['halt.target', ''], ['hibernate.target', 'ENABLE_HIBERNATE'], ['hybrid-sleep.target', 'ENABLE_HIBERNATE'], ['suspend-then-hibernate.target', 'ENABLE_HIBERNATE'], ['initrd-cleanup.service', 'ENABLE_INITRD'], - ['initrd-cryptsetup.target', 'HAVE_LIBCRYPTSETUP ENABLE_INITRD', - 'sysinit.target.wants/'], ['initrd-fs.target', 'ENABLE_INITRD'], ['initrd-parse-etc.service', 'ENABLE_INITRD'], ['initrd-root-device.target', 'ENABLE_INITRD'], @@ -61,8 +59,9 @@ units = [ 'sysinit.target.wants/'], ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], ['reboot.target', '', - (with_runlevels ? 'runlevel6.target ctrl-alt-del.target' : 'ctrl-alt-del.target')], - ['remote-cryptsetup.target', 'HAVE_LIBCRYPTSETUP'], + 'ctrl-alt-del.target' + (with_runlevels ? ' runlevel6.target' : '')], + ['remote-cryptsetup.target', 'HAVE_LIBCRYPTSETUP', + 'initrd-root-device.target.wants/'], ['remote-fs-pre.target', ''], ['remote-fs.target', ''], ['rescue.target', '', |