From 389352e2d6a29e86096e1924cad4cc36249a5c21 Mon Sep 17 00:00:00 2001
From: Dave Jansen <i.am@davejansen.com>
Date: Mon, 1 Dec 2025 20:06:06 +0900
Subject: [PATCH] Attempt to re-add (optionally) writing `passwd` changes

---
 build_files/cleanup.sh | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/build_files/cleanup.sh b/build_files/cleanup.sh
index cfcca7b..a5b19bf 100755
--- a/build_files/cleanup.sh
+++ b/build_files/cleanup.sh
@@ -14,20 +14,28 @@ echo "/usr/lib/group contents:"
 cat /usr/lib/group
 
 ## Handle files that rpm-ostree would normally remove
-## Borrowed from: https://github.com/hhd-dev/rechunk/blob/master/1_prune.sh#L33
-# if [ -f /etc/passwd ]; then
-#   echo
-#   echo Appending the following passwd users to /usr/lib/passwd
-#   out=$(grep -v "root" /etc/passwd)
-#   echo "$out"
-#   echo "$out" >>/usr/lib/passwd
-# fi
+## Adapted from: https://github.com/hhd-dev/rechunk/blob/master/1_prune.sh#L33
+
+if [ -f /etc/passwd ]; then
+  out=$(grep -v "root" /etc/passwd)
+
+  if [ ! -z "$out" ]; then
+    echo
+    echo Appending the following passwd users to /usr/lib/passwd
+    echo "$out"
+    echo "$out" >>/usr/lib/passwd
+  fi
+fi
+
 if [ -f /etc/group ]; then
-  echo
-  echo Appending the following group entries to /usr/lib/group
   out=$(grep -v "root\|wheel" /etc/group)
-  echo "$out"
-  echo "$out" >>/usr/lib/group
+
+  if [ ! -z "$out" ]; then
+    echo
+    echo Appending the following group entries to /usr/lib/group
+    echo "$out"
+    echo "$out" >>/usr/lib/group
+  fi
 fi
 
 if [ -f /etc/passwd ] || [ -f /etc/group ]; then