=== modified file 'service_scripts/generic/finish'
--- service_scripts/generic/finish	2020-12-16 21:55:20 +0000
+++ service_scripts/generic/finish	2020-12-16 15:24:48 +0000
@@ -6,7 +6,7 @@
 }
 multisubstitute {
 	define CONTAINER_TMPFS /run/containers/${CONTAINER_NAME}.${CONTAINER_USER}
-#	define CONTAINER_DATA /mnt/volumes/containers/user/${CONTAINER_USER}/${CONTAINER_NAME}
+	define CONTAINER_DATA /mnt/volumes/containers/user/${CONTAINER_USER}/${CONTAINER_NAME}
 }
-foreground { umount --recursive data/root }
+foreground { umount --recursive ${CONTAINER_DATA}/union }
 rm -rf ${CONTAINER_TMPFS}

=== modified file 'service_scripts/generic/run'
--- service_scripts/generic/run	2020-12-16 21:55:20 +0000
+++ service_scripts/generic/run	2020-12-16 15:24:48 +0000
@@ -10,14 +10,14 @@
 multisubstitute {
 	importas -i CONTAINER_USER_HOME CONTAINER_USER_HOME
 	define CONTAINER_TMPFS /run/containers/${CONTAINER_NAME}.${CONTAINER_USER}
-#	define CONTAINER_DATA /mnt/volumes/containers/user/${CONTAINER_USER}/${CONTAINER_NAME}
+	define CONTAINER_DATA /mnt/volumes/containers/user/${CONTAINER_USER}/${CONTAINER_NAME}
 	define -s tmpfs_dirs "home run tmp inbox run/inbox tmp/.X11-unix"
 }
 if { rm -rf ${CONTAINER_TMPFS} }
 if { mkdir -p ${CONTAINER_TMPFS}/${tmpfs_dirs} }
 if { chmod 1770 ${CONTAINER_TMPFS}/${tmpfs_dirs} }
 if { chown root:${CONTAINER_USER} ${CONTAINER_TMPFS}/${tmpfs_dirs} }
-if { mount -a --fstab data/fstab }
+if { mount -a --fstab /mnt/volumes/containers/user/${CONTAINER_USER}/${CONTAINER_NAME}/fstab }
 s6-envuidgid -B ${CONTAINER_USER}:${CONTAINER_USER}
 multisubstitute { importas -i UID UID importas -i GID GID }
 env
@@ -25,5 +25,5 @@
   RUN_CHOWN=${UID}:${GID}
   NS_EXTRA="if { mount -o bind,ro /etc/passwd etc/passwd } if { mount -o bind,ro /etc/group etc/group }"
 s6-envuidgid ${CONTAINER_USER}
-/root/ns_run data/root
+/root/ns_run /mnt/volumes/containers/user/${CONTAINER_USER}/${CONTAINER_NAME}/union
 /mnt/ns/bin/s6-applyuidgid -U ${CONTAINER_USER_HOME}/run/init

=== modified file 'service_scripts/xsession/finish'
--- service_scripts/xsession/finish	2020-12-16 21:55:20 +0000
+++ service_scripts/xsession/finish	2020-12-16 15:24:48 +0000
@@ -6,12 +6,12 @@
 }
 multisubstitute {
 	define CONTAINER_TMPFS /run/containers/${CONTAINER_NAME}.${CONTAINER_USER}
-#	define CONTAINER_DATA /mnt/volumes/containers/user/${CONTAINER_USER}/${CONTAINER_NAME}
+	define CONTAINER_DATA /mnt/volumes/containers/user/${CONTAINER_USER}/${CONTAINER_NAME}
 }
 foreground { umount ${CONTAINER_TMPFS}/home }
 foreground { umount ${CONTAINER_TMPFS}/run }
 foreground { umount ${CONTAINER_TMPFS}/inbox }
 foreground { umount ${CONTAINER_TMPFS}/tmp }
-foreground { umount --recursive data/root/ }
+foreground { umount --recursive ${CONTAINER_DATA}/root }
 rm -rf ${CONTAINER_TMPFS}
 #rm -rf /run/containers/xsession.6.ccx

=== modified file 'service_scripts/xsession/run'
--- service_scripts/xsession/run	2020-12-16 21:55:20 +0000
+++ service_scripts/xsession/run	2020-12-16 15:24:48 +0000
@@ -8,21 +8,21 @@
 multisubstitute {
 	importas -i CONTAINER_USER_HOME CONTAINER_USER_HOME
 	define CONTAINER_TMPFS /run/containers/${CONTAINER_NAME}.${CONTAINER_USER}
-#	define CONTAINER_DATA /mnt/volumes/containers/user/${CONTAINER_USER}/${CONTAINER_NAME}
+	define CONTAINER_DATA /mnt/volumes/containers/user/${CONTAINER_USER}/${CONTAINER_NAME}
 	define -s tmpfs_dirs "home run tmp inbox run/inbox tmp/.X11-unix"
 }
 if { rm -rf ${CONTAINER_TMPFS} }
 if { mkdir -p ${CONTAINER_TMPFS}/${tmpfs_dirs} }
 if { chmod 1770 ${CONTAINER_TMPFS}/${tmpfs_dirs} }
 if { chown root:${CONTAINER_USER} ${CONTAINER_TMPFS}/${tmpfs_dirs} }
-if { mount -a --fstab data/fstab }
+if { mount -a --fstab ${CONTAINER_DATA}/fstab }
 s6-envuidgid ${CONTAINER_USER}
 if { env HOME=${CONTAINER_USER_HOME} s6-applyuidgid -U ${CONTAINER_USER_HOME}/xsession-setup ${CONTAINER_TMPFS} 6 }
 env
   HOST=carbon
   NS_EXTRA="if { mount -o bind,ro /etc/passwd etc/passwd } if { mount -o bind,ro /etc/group etc/group }"
 unshare -n
-/root/ns_run data/root /mnt/ns/bin/s6-applyuidgid -U /run/init
+/root/ns_run ${CONTAINER_DATA}/root /mnt/ns/bin/s6-applyuidgid -U /run/init
 
 
 # if { rm -rf /run/containers/xsession.6.ccx }