mrrl-containers

commit 119ab93195c596608358f449e618f0e049f78b18
parent 0d3f16e049f22ebb68c1d39e315ffdf4c17094ae
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Sat, 25 Jun 2022 13:07:56 +0200

Add umask, fix s6-setuidgid invocation
Diffstat:
M
zsh-functions/confz_containers_init
 | 
8
++++++--

1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/zsh-functions/confz_containers_init b/zsh-functions/confz_containers_init
@@ -95,7 +95,8 @@ confz_container_service_check() {
 	require fs_m filename=$vars[svc_dir]/supervise/lock mode=644
 
 	if (($+vars[log_dir])); then
-		require container_service_log :svc_dir :log_dir :log_uid :log_gid
+		require container_service_log :svc_dir :log_dir :log_uid :log_gid \
+			\?log_umask
 	else
 		[[ -e $vars[svc_dir]/log/supervise ]] && \
 			die "Should not have a logger but one might be running: ${(qqq)vars[svc_dir]}"
@@ -105,12 +106,15 @@ confz_container_service_check() {
 
 confz_container_service_log_check() {
 	checkvars svc_dir log_dir log_uid log_gid
+	defvar log_umask 007
 
 	local -a runscript=(
 		'#!/command/execlineb -P'
+		"umask $vars[log_umask]"
+		"if { mkdir -p ${(qqq)vars[log_dir]} }"
 		"if { mkdir -p ${(qqq)vars[log_dir]} }"
 		"if { chown -R $vars[log_uid]:$vars[log_gid] ${(qqq)vars[log_dir]} }"
-		"s6-setuidgid :$vars[log_uid]:$vars[log_gid]"
+		"s6-setuidgid $vars[log_uid]:$vars[log_gid]"
 		"s6-log -b -- t ${(qqq)vars[log_dir]}"
 	)