core/dracut/ignition-ostree: add chroot binary

HuijingHei · HuijingHei · commit e762ba88f676 · 2023-11-06T17:05:04.000+08:00
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/coreos-sysroot-bwrap b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/coreos-sysroot-bwrap
@@ -46,7 +46,7 @@ cleanup() {
 
   umount --lazy --recursive "${TMP_CHROOT_DIR}"
   umount --recursive "${TMP_CHROOT_DIR}"
-  rmdir "${TMP_CHROOT_DIR}"
+  rm --dir "${TMP_CHROOT_DIR}"
 }
 
 trap cleanup EXIT
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-sysusers.service b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-sysusers.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Populate OSTree sysusers
+Description=Ignition OSTree: Create System Users
 DefaultDependencies=false
 ConditionKernelCommandLine=|ostree
 
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/module-setup.sh b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/module-setup.sh
@@ -22,9 +22,9 @@ installkernel() {
 
 install() {
     inst_multiple \
+        chroot \
         bwrap \
         realpath \
-        rmdir \
         setfiles \
         chcon \
         systemd-sysusers \

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ cleanup() {`
`46`	`46`
`47`	`47`	`umount --lazy --recursive "${TMP_CHROOT_DIR}"`
`48`	`48`	`umount --recursive "${TMP_CHROOT_DIR}"`
`49`		`- rmdir "${TMP_CHROOT_DIR}"`
	`49`	`+ rm --dir "${TMP_CHROOT_DIR}"`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`trap cleanup EXIT`