=== modified file 'service_scripts/generic/run'
--- old/service_scripts/generic/run	2022-10-12 14:32:33 +0000
+++ new/service_scripts/generic/run	2022-06-25 13:22:17 +0000
@@ -30,22 +30,17 @@
 if { chown root:${CONTAINER_USER} ${CONTAINER_TMPFS}/${tmpfs_dirs} }
 if { mount -a --fstab data/fstab }
 
-# Put UID/GID/GIDLIST into environment for use by s6-applyuidgid below
-s6-envuidgid ${CONTAINER_USER}
-
-# Run user's setup script (optional)
-if {
-	if -n -t { s6-test -e ${CONTAINER_USER_HOME}/container-setup }
-	env HOME=${CONTAINER_USER_HOME}
-	s6-applyuidgid -U
-	${CONTAINER_USER_HOME}/container-setup ${CONTAINER_TMPFS} ${CONTAINER_NAME}
-}
-
+# Put UID/GID of user and their exclusive group (same group name as user name)
+#s6-envuidgid -B ${CONTAINER_USER}:${CONTAINER_USER}
+
+#multisubstitute { importas -i UID UID importas -i GID GID }
 env
   HOST=${CONTAINER_NAME}
   #RUN_CHOWN=${UID}:${GID}
   NS_EXTRA="if { mount -o bind,ro /etc/passwd etc/passwd } if { mount -o bind,ro /etc/group etc/group }"
 
+# Put UID/GID/GIDLIST into environment for use by s6-applyuidgid below
+s6-envuidgid ${CONTAINER_USER}
 emptyenv -c
 ns_run data/root
 /mnt/ns/bin/s6-applyuidgid -U

=== modified file 'service_scripts/xsession/run'
--- old/service_scripts/xsession/run	2022-10-12 14:32:33 +0000
+++ new/service_scripts/xsession/run	2022-06-25 13:31:03 +0000
@@ -1,4 +1,4 @@
-#!/command/execlineb -P
+#!/command/execlineb
 fdmove -c 2 1
 
 s6-envdir env