From 108089eac206def41dd86b7312190e90b0c0c038 Mon Sep 17 00:00:00 2001
From: "Lance R. Vick" <lance@lrvick.net>
Date: Mon, 1 May 2023 15:53:32 -0700
Subject: [PATCH] handle host user being root or a default debian user/group

---
 scripts/host-env | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/scripts/host-env b/scripts/host-env
index efa7e99..17b978e 100755
--- a/scripts/host-env
+++ b/scripts/host-env
@@ -6,15 +6,23 @@ gid=${GID?}
 user=${USER:-"build"}
 export HOME="/home/${user}"
 
-groupdel dialout
-groupadd -g "$gid" "${user}"
-useradd \
-	-g "$gid" \
-	-G sudo \
-	-u "$uid" \
-	-d "/home/${user}" \
-	-s /bin/bash \
-	"${user}"
+# If running user is not root, make a custom user/group
+[ "$uid" != "0" ] && {
+    getent group "$gid" && groupdel "$gid"
+    getent passwd "$uid" && userdel "$uid"
+    groupadd -g "$gid" "${user}"
+    useradd \
+    	-g "$gid" \
+    	-G sudo \
+    	-u "$uid" \
+    	-d "/home/${user}" \
+    	-s /bin/bash \
+    	"${user}"
+}
 
 cd "$HOME"
-setpriv --reuid="$uid" --regid="$gid" --init-groups "$@"
+
+# If running user is not root, pivot to running user
+[ "$uid" != "0" ] && {
+    setpriv --reuid="$uid" --regid="$gid" --init-groups "$@"
+}