=== modified file 'service_scripts/generic/run' --- old/service_scripts/generic/run 2022-06-25 10:42:27 +0000 +++ new/service_scripts/generic/run 2022-06-25 09:36:33 +0000 @@ -1,4 +1,4 @@ -#!/command/execlineb -P +#!/command/execlineb #define CONTAINER_NAME alpine-games #define CONTAINER_USER ccx s6-envdir env === modified file 'zsh-functions/confz_containers_init' --- old/zsh-functions/confz_containers_init 2022-06-25 10:42:27 +0000 +++ new/zsh-functions/confz_containers_init 2022-06-25 09:28:21 +0000 @@ -93,31 +93,6 @@ require fs_o filename=$vars[svc_dir]/supervise/lock \ owner=$vars[control_user]:0 require fs_m filename=$vars[svc_dir]/supervise/lock mode=644 - - if (($+vars[log_dir])); then - require container_service_log :log_dir :log_uid :log_gid - else - [[ -e $vars[svc_dir]/log/supervise ]] && \ - die "Should not have a logger but one might be running: ${(qqq)vars[svc_dir]}" - require fs_r flags=r filename=$vars[svc_dir]/log - fi -} - -confz_container_service_log_check() { - checkvars svc_dir log_dir log_uid log_gid - - local -a runscript=( - '#!/command/execlineb -P' - "if { mkdir -p ${(qqq)vars[log_dir]} }" - "if { chown -R $vars[log_user]:$vars[log_group] ${(qqq)vars[log_dir]} }" - "s6-setuidgid :$vars[log_user]:$vars[log_group]" - "s6-log -b -- t ${(qqq)vars[log_dir]}" - ) - - require fs_d filename=$vars[svc_dir]/log - require fs_m filename=$vars[svc_dir]/log mode=755 - require fs_contentnl filename=$vars[svc_dir]/log/run \ - content="${(F)runscript}" } confz_container_service_preset_check() { @@ -259,7 +234,7 @@ } confz_container_service_generic_check() { - local uid gid container_user_dir svc_dir log_dir container + local uid gid container_user_dir svc_dir container local -a fstab mnt_dirs checkvars containers_dir svscan_dir image_name user defvar fstab_extra '' @@ -308,11 +283,9 @@ ) svc_dir=$vars[svscan_dir]/container.$container.$vars[user] - log_dir=/run/container-logs/container.$container.$vars[user] require container_service_preset preset=generic \ svc_dir=$svc_dir control_user=$uid control_group=$gid \ root_link=$container_user_dir/root \ - log_dir=$log_dir log_uid=0 log_gid=$gid \ fstab=${(F)fstab} \?down \?fstab_post require fs_d filename=$svc_dir/env require fs_contentnl filename=$svc_dir/env/CONTAINER_USER \