From e816126ea2a2b8e8886531adf07e4031d86c9edc Mon Sep 17 00:00:00 2001 From: Dave Jansen Date: Mon, 1 Dec 2025 22:08:48 +0900 Subject: [PATCH] "Let's try this again" --- build_files/cleanup.sh | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/build_files/cleanup.sh b/build_files/cleanup.sh index a4f4304..7c0a9fb 100755 --- a/build_files/cleanup.sh +++ b/build_files/cleanup.sh @@ -2,33 +2,22 @@ set -ouex pipefail -echo "Let's see." -echo "/etc/passwd contents:" -cat /etc/passwd -echo "/usr/lib/passwd contents:" -cat /usr/lib/passwd -echo "" -echo "/etc/group contents:" -cat /etc/group -echo "/usr/lib/group contents:" -cat /usr/lib/group - ## Handle files that rpm-ostree would normally remove ## 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) + out="$(grep -v 'root' /etc/passwd)" if [[ ! -z "$out" ]]; then echo echo Appending the following passwd users to /usr/lib/passwd - echo "--here--${out}--here--" + echo "${out}" echo "$out" >>/usr/lib/passwd fi fi if [ -f /etc/group ]; then - out=$(grep -v "root\|wheel" /etc/group) + out="$(grep -v 'root\|wheel' /etc/group)" if [[ ! -z "$out" ]]; then echo