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

Andrei-Pozolotin · web-flow · commit 4b4e27c48915 · 2020-04-21T18:47:31.000-05:00
crypto target
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
`@@ -28,4 +28,4 @@ WantedBy=sysinit.target`
`28`	`28`
`29`	`29`	`[X-SystemdTool]`
`30`	`30`
`31`		`-# empty`
	`31`	`+# not used`
Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,4 @@ WantedBy=initrd-root-fs.target`
`26`	`26`
`27`	`27`	`[X-SystemdTool]`
`28`	`28`
`29`		`-# empty`
	`29`	`+# not used`
Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,11 @@`
`77`	`77`	`"/etc/systemd/system/sysinit.target.wants/initrd-cryptsetup.path",`
`78`	`78`	`"/etc/systemd/system/sysinit.target.wants/initrd-debug-progs.service",`
`79`	`79`
	`80`	`+ "/usr/lib/systemd/system/sysinit.target.wants/cryptsetup.target",`
	`81`	`+`
`80`	`82`	`"/etc/systemd/system/initrd-root-fs.target.wants/initrd-sysroot-mount.service",`
`81`	`83`
	`84`	`+`
`82`	`85`	`]`
`83`	`86`
`84`	`87`	`text_list = [`