Merge pull request #65 from random-archer/dev-crypto-target

crypto target
random-archer · Apr 21, 2020 · 4b4e27c · 4b4e27c
2 parents 4af000b + 2f9a121
commit 4b4e27c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 = [
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,4 +28,4 @@ WantedBy=sysinit.target

		[X-SystemdTool]

		# empty
		# not used
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,4 +26,4 @@ WantedBy=initrd-root-fs.target

		[X-SystemdTool]

		# empty
		# not used