From 2f9a121d2733cee59fe8b6961a7087f9d8c15409 Mon Sep 17 00:00:00 2001 From: Andrei Pozolotin Date: Tue, 21 Apr 2020 18:38:31 -0500 Subject: [PATCH] crypto target --- src/initrd-cryptsetup.service | 4 ++-- src/initrd-debug-shell.service | 2 +- src/initrd-sysroot-mount.service | 2 +- .../usr/lib/systemd/system/initrd-cryptsetup.service | 4 ++-- tool/image/test/cryptsetup/verify.py | 3 +++ 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/initrd-cryptsetup.service b/src/initrd-cryptsetup.service index e6ab35b..cbd5d2f 100644 --- a/src/initrd-cryptsetup.service +++ b/src/initrd-cryptsetup.service @@ -74,8 +74,8 @@ InitrdPath=/usr/lib/udev/rules.d/13-dm-disk.rules InitrdPath=/usr/lib/udev/rules.d/95-dm-notify.rules # include systemd cryptsetup support -InitrdPath=/usr/lib/systemd/system/cryptsetup.target -InitrdPath=/usr/lib/systemd/system/cryptsetup-pre.target +InitrdUnit=/usr/lib/systemd/system/cryptsetup.target +InitrdUnit=/usr/lib/systemd/system/cryptsetup-pre.target InitrdBinary=/usr/lib/systemd/systemd-cryptsetup InitrdBinary=/usr/lib/systemd/system-generators/systemd-cryptsetup-generator InitrdBinary=/usr/lib/systemd/system-generators/systemd-fstab-generator diff --git a/src/initrd-debug-shell.service b/src/initrd-debug-shell.service index fd55473..b0cf4c0 100644 --- a/src/initrd-debug-shell.service +++ b/src/initrd-debug-shell.service @@ -28,4 +28,4 @@ WantedBy=sysinit.target [X-SystemdTool] -# empty +# not used diff --git a/src/initrd-sysroot-mount.service b/src/initrd-sysroot-mount.service index f535399..ba5e26a 100644 --- a/src/initrd-sysroot-mount.service +++ b/src/initrd-sysroot-mount.service @@ -26,4 +26,4 @@ WantedBy=initrd-root-fs.target [X-SystemdTool] -# empty +# not used diff --git a/tool/image/test/cryptsetup/test_base/usr/lib/systemd/system/initrd-cryptsetup.service b/tool/image/test/cryptsetup/test_base/usr/lib/systemd/system/initrd-cryptsetup.service index d2f7d2f..681d0f7 100644 --- a/tool/image/test/cryptsetup/test_base/usr/lib/systemd/system/initrd-cryptsetup.service +++ b/tool/image/test/cryptsetup/test_base/usr/lib/systemd/system/initrd-cryptsetup.service @@ -75,8 +75,8 @@ InitrdPath=/usr/lib/udev/rules.d/13-dm-disk.rules InitrdPath=/usr/lib/udev/rules.d/95-dm-notify.rules # include systemd cryptsetup support -InitrdPath=/usr/lib/systemd/system/cryptsetup.target -InitrdPath=/usr/lib/systemd/system/cryptsetup-pre.target +InitrdUnit=/usr/lib/systemd/system/cryptsetup.target +InitrdUnit=/usr/lib/systemd/system/cryptsetup-pre.target InitrdBinary=/usr/lib/systemd/systemd-cryptsetup InitrdBinary=/usr/lib/systemd/system-generators/systemd-cryptsetup-generator InitrdBinary=/usr/lib/systemd/system-generators/systemd-fstab-generator diff --git a/tool/image/test/cryptsetup/verify.py b/tool/image/test/cryptsetup/verify.py index 9d30c62..85a8827 100755 --- a/tool/image/test/cryptsetup/verify.py +++ b/tool/image/test/cryptsetup/verify.py @@ -77,8 +77,11 @@ "/etc/systemd/system/sysinit.target.wants/initrd-cryptsetup.path", "/etc/systemd/system/sysinit.target.wants/initrd-debug-progs.service", + "/usr/lib/systemd/system/sysinit.target.wants/cryptsetup.target", + "/etc/systemd/system/initrd-root-fs.target.wants/initrd-sysroot-mount.service", + ] text_list = [