=== modified file 'service_scripts/generic/run' --- old/service_scripts/generic/run 2021-01-19 01:25:33 +0000 +++ new/service_scripts/generic/run 2020-12-18 05:25:10 +0000 @@ -3,12 +3,12 @@ #define CONTAINER_USER ccx s6-envdir env multisubstitute { - importas -i -u CONTAINER_NAME CONTAINER_NAME - importas -i -u CONTAINER_USER CONTAINER_USER + importas -i CONTAINER_NAME CONTAINER_NAME + importas -i CONTAINER_USER CONTAINER_USER } backtick -in CONTAINER_USER_HOME { homeof $CONTAINER_USER } multisubstitute { - importas -i -u CONTAINER_USER_HOME CONTAINER_USER_HOME + 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 -s tmpfs_dirs "home run tmp inbox run/inbox tmp/.X11-unix" === modified file 'service_scripts/xsession/run' --- old/service_scripts/xsession/run 2021-01-19 01:25:33 +0000 +++ new/service_scripts/xsession/run 2020-12-18 05:34:09 +0000 @@ -1,13 +1,12 @@ #!/command/execlineb s6-envdir env multisubstitute { - importas -i -u CONTAINER_NAME CONTAINER_NAME - importas -i -u CONTAINER_USER CONTAINER_USER + importas -i CONTAINER_NAME CONTAINER_NAME + importas -i CONTAINER_USER CONTAINER_USER } backtick -in CONTAINER_USER_HOME { homeof $CONTAINER_USER } multisubstitute { - importas -i -u CONTAINER_USER_HOME CONTAINER_USER_HOME - importas -i -u vtN vtN + 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 -s tmpfs_dirs "home run tmp inbox run/inbox tmp/.X11-unix" @@ -25,7 +24,7 @@ if { env HOME=${CONTAINER_USER_HOME} s6-applyuidgid -U - ${CONTAINER_USER_HOME}/xsession-setup ${CONTAINER_TMPFS} ${vtN} + ${CONTAINER_USER_HOME}/xsession-setup ${CONTAINER_TMPFS} 6 } env === modified file 'zsh-functions/confz_containers_init' --- old/zsh-functions/confz_containers_init 2021-01-19 01:25:33 +0000 +++ new/zsh-functions/confz_containers_init 2021-01-16 00:56:02 +0000 @@ -202,10 +202,6 @@ content=$vars[user] require fs_contentnl filename=$svc_dir/env/CONTAINER_NAME \ content=$container - require fs_contentnl filename=$svc_dir/env/DISPLAY \ - content=:$vars[display_number] - require fs_contentnl filename=$svc_dir/env/vtN \ - content=$vars[display_number] } # --- old