=== modified file 'service_scripts/generic/run' --- old/service_scripts/generic/run 2022-02-20 11:54:18 +0000 +++ new/service_scripts/generic/run 2021-09-02 14:35:49 +0000 @@ -12,7 +12,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 -sCn CONTAINER_MNT_DIRS } getpid NS_PID @@ -25,7 +24,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-02-20 11:54:18 +0000 +++ new/zsh-functions/confz_containers_init 2022-02-18 18:02:38 +0000 @@ -235,10 +235,9 @@ confz_container_service_generic_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 defvar fstab_extra '' - defvar mnt_dirs_extra 'ns' defvar container_name "$vars[image_name]" container=$vars[container_name] @@ -270,15 +269,12 @@ require fs_l filename=$vars[containers_dir]/home/$vars[user]/$container \ destination=../../user/$vars[user]/$container/home/$vars[user] - mnt_dirs=( ns $=mnt_dirs_extra ) - fstab=( $vars[containers_dir]/systems/$vars[image_name]$'\t'$container_user_dir/root$'\tnone\tbind,ro,nosuid,nodev\t0 0' $container_user_dir/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/containers/$container.$vars[user]/mnt$'\t'$container_user_dir/root/mnt$'\tnone\tbind,ro,nosuid,nodev\t0 0' "${(f@)vars[fstab_extra]}" ) @@ -292,8 +288,6 @@ content=$vars[user] require fs_contentnl filename=$svc_dir/env/CONTAINER_NAME \ content=$container - require fs_contentnl filename=$svc_dir/env/CONTAINER_MNT_DIRS \ - content="$mnt_dirs" } confz_container_service_alsa_check() { @@ -470,9 +464,9 @@ require fs_m filename="$vars[root]/mnt" mode=0755 require fs_o filename="$vars[root]/mnt" owner=$vars[uid]:$vars[gid] - # require fs_d filename="$vars[root]/mnt/ns" - # require fs_m filename="$vars[root]/mnt/ns" mode=0755 - # require fs_o filename="$vars[root]/mnt/ns" owner=$vars[uid]:$vars[gid] + require fs_d filename="$vars[root]/mnt/ns" + require fs_m filename="$vars[root]/mnt/ns" mode=0755 + require fs_o filename="$vars[root]/mnt/ns" owner=$vars[uid]:$vars[gid] require fs_d filename="$vars[root]/run" require fs_m filename="$vars[root]/run" mode=0755