=== modified file 'service_scripts/generic/finish' --- old/service_scripts/generic/finish 2022-06-25 11:22:57 +0000 +++ new/service_scripts/generic/finish 2020-12-16 21:55:20 +0000 @@ -9,5 +9,4 @@ # define CONTAINER_DATA /mnt/volumes/containers/user/${CONTAINER_USER}/${CONTAINER_NAME} } foreground { umount --recursive data/root } -foreground { rm -rf ${CONTAINER_TMPFS} } -s6-svc -a log # rotate the log +rm -rf ${CONTAINER_TMPFS} === modified file 'service_scripts/xsession/run' --- old/service_scripts/xsession/run 2022-06-25 11:22:57 +0000 +++ new/service_scripts/xsession/run 2022-06-25 09:36:33 +0000 @@ -11,7 +11,6 @@ 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" - importas -D ns -s -C -u CONTAINER_MNT_DIRS CONTAINER_MNT_DIRS } getpid NS_PID @@ -24,7 +23,7 @@ } if { rm -rf ${CONTAINER_TMPFS} } -if { mkdir -p ${CONTAINER_TMPFS}/${tmpfs_dirs} ${CONTAINER_TMPFS}/mnt/${CONTAINER_MNT_DIRS} } +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 } === modified file 'zsh-functions/confz_containers_init' --- old/zsh-functions/confz_containers_init 2022-06-25 11:22:57 +0000 +++ new/zsh-functions/confz_containers_init 2022-06-25 11:07:56 +0000 @@ -106,7 +106,7 @@ confz_container_service_log_check() { checkvars svc_dir log_dir log_uid log_gid - defvar log_umask 027 + defvar log_umask 007 local -a runscript=( '#!/command/execlineb -P' @@ -389,10 +389,9 @@ confz_container_service_xsession_check() { local uid gid container_user_dir svc_dir container - local -a fstab mnt_dirs + local -a fstab checkvars containers_dir svscan_dir image_name user display_number defvar fstab_extra '' - defvar mnt_dirs_extra '' container=xsession.$vars[display_number] uid="${${(s.:.)"$(getent passwd $vars[user])"}[3]}" \ @@ -416,15 +415,12 @@ require fs_l filename=$vars[containers_dir]/home/$vars[user]/$container \ destination=../../user/$vars[user]/$container/root/home/$vars[user] - mnt_dirs=( ns logs $=vars[mnt_dirs_extra] ) - fstab=( $vars[containers_dir]/systems/$vars[image_name]$'\t'$container_user_dir/root$'\tnone\tbind,ro,nosuid,nodev\t0 0' /run/containers/$container.$vars[user]/home$'\t'$container_user_dir/root/home$'\tnone\tbind,nosuid,nodev\t0 0' /run/containers/$container.$vars[user]/run$'\t'$container_user_dir/root/run$'\tnone\tbind,nosuid,nodev\t0 0' /run/containers/$container.$vars[user]/tmp$'\t'$container_user_dir/root/tmp$'\tnone\tbind,nosuid,nodev\t0 0' /run/containers/$container.$vars[user]/inbox$'\t'$container_user_dir/root/.inbox$'\tnone\tbind,ro,nosuid,nodev\t0 0' - /run/container-logs$'\t'$container_user_dir/root/mnt/logs$'\tnone\tbind,ro,nosuid,nodev\t0 0' "${(f@)vars[fstab_extra]}" ) @@ -442,8 +438,6 @@ content=:$vars[display_number] require fs_contentnl filename=$svc_dir/env/vtN \ content=$vars[display_number] - require fs_contentnl filename=$svc_dir/env/CONTAINER_MNT_DIRS \ - content="$mnt_dirs" } # --- new image constructor