From 6bdcb72086b681a0d42521169fdadb65ef2ac539 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Tue, 27 Oct 2020 13:26:01 +0100 Subject: 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. --- units/initrd-cryptsetup.target | 17 ----------------- units/meson.build | 2 -- 2 files changed, 19 deletions(-) delete mode 100644 units/initrd-cryptsetup.target (limited to 'units') 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 670f366b92..a8c52e96a7 100644 --- a/units/meson.build +++ b/units/meson.build @@ -28,8 +28,6 @@ units = [ ['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'], -- cgit v1.2.3