From e762ba88f676fb2148e5a8fc5b22857bd6d67eab Mon Sep 17 00:00:00 2001
From: HuijingHei <hhei@redhat.com>
Date: Fri, 13 Oct 2023 17:32:53 +0800
Subject: [PATCH] core/dracut/ignition-ostree: add `chroot` binary

---
 .../lib/dracut/modules.d/40ignition-ostree/coreos-sysroot-bwrap | 2 +-
 .../40ignition-ostree/ignition-ostree-sysusers.service          | 2 +-
 .../usr/lib/dracut/modules.d/40ignition-ostree/module-setup.sh  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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
index dd51530b2a..c9b0f51d5d 100755
--- 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
index 9dbfdacfc3..c6b1201f59 100644
--- 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
index 24bf454c28..ee0200e98b 100755
--- 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 \