mrrl-containers

commit 4ba147b12acdcfbd8d83815b2404494a2a3e3c0c
parent eb40c60697c2748975857db751096bbca480aa04
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Sat, 25 Jun 2022 13:51:37 +0200

Enable logging for all container types except for sysroot
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
@@ -315,11 +315,11 @@ confz_container_service_generic_check() {
 	)
 
 	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 \
+		log_dir=/run/container-logs/container.$container.$vars[user] \
+		log_uid=0 log_gid=$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 \
@@ -378,6 +378,8 @@ confz_container_service_alsa_check() {
 	svc_dir=$vars[svscan_dir]/container.$container.$vars[user]
 	require container_service_preset preset=alsa \
 		svc_dir=$svc_dir control_user=$uid control_group=$gid \
+		log_dir=/run/container-logs/container.$container.$vars[user] \
+		log_uid=0 log_gid=$gid \
 		root_link=$container_user_dir/root \
 		fstab=${(F)fstab} \?down \?fstab_post
 	require fs_d filename=$svc_dir/env
@@ -432,6 +434,8 @@ confz_container_service_xsession_check() {
 	svc_dir=$vars[svscan_dir]/container.xsession.$vars[display_number].$vars[user]
 	require container_service_preset preset=xsession \
 		svc_dir=$svc_dir control_user=$uid control_group=$gid \
+		log_dir=/run/container-logs/container.$container.$vars[user] \
+		log_uid=0 log_gid=$gid \
 		root_link=$container_user_dir/root \
 		fstab=${(F)fstab} \?down \?fstab_post
 	require fs_d filename=$svc_dir/env