mrrl-containers

commit 07ceb34e55c8135c84a4931c3da504cf179d661f
parent e1e16c08f53d80d08f0ce9e405115fd650270e6b
Author: ccx <ccx@te2000.cz>
Date:   Thu, 29 Feb 2024 18:40:15 +0000

overridable settings for directories

Diffstat:
M
zsh-functions/confz_containers_init
 | 
15
+++++++++++----

1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/zsh-functions/confz_containers_init b/zsh-functions/confz_containers_init
@@ -127,8 +127,7 @@ confz_container_service_log_check() {
 }
 
 confz_container_service_preset_check() {
-	# local preset_dir=/usr/local/bzr/containers/service_scripts
-	local preset_dir=$functions_source[confz_container_service_preset_check]:A:h:h/service_scripts
+	local preset_dir=$container_service_script_dir
 	checkvars svc_dir preset root_link fstab
 	[[ -x $preset_dir/$vars[preset]/run ]] || die "not an executable file: $preset_dir/$vars[preset]/run"
 	[[ -x $preset_dir/$vars[preset]/finish ]] || die "not an executable file: $preset_dir/$vars[preset]/finish"
@@ -138,6 +137,13 @@ confz_container_service_preset_check() {
 		:svc_dir :root_link :fstab \?down \?control_user \?control_group \?fstab_post \
 		\?log_dir \?log_uid \?log_gid
 }
+() {
+	(($+container_service_script_dir)) && return
+	local d=$functions_source[confz_container_service_preset_check]:A:h:h/service_scripts
+	if [[ -d $d ]]; then
+		typeset -g container_service_script_dir=$d
+	fi
+}
 
 confz_container_group_check() {
 	checkvars group_name
@@ -469,6 +475,7 @@ confz_container_service_xsession_check() {
 # --- new image constructor
 
 () {
+	(($+container_template_dir)) && return
 	local f d
 	for f in $^fpath/confz_containers_init*(N); do
 		d=$f:A:h:h/container_template
@@ -819,7 +826,7 @@ confz_container_alpine_base_files_check() {
 
 confz_container_alpine_apk_check() {
 	checkvars sysroot_user root arch
-	defvar keys_dir /etc/apk/keys
+	defvar keys_dir ${container_alpine_keys_dir:-/etc/apk/keys}
 	defvar apk_executable apk
 	do_command=(
 		s6-setuidgid $vars[sysroot_user]
@@ -1073,7 +1080,7 @@ confz_container_nix_image_from_release_check() {
 
 confz_container_nix_bootstrap_packages_check() {
 	checkvars sysroot_user root arch uid gid
-	defvar keys_dir /etc/apk/keys
+	defvar keys_dir ${container_alpine_keys_dir:-/etc/apk/keys}
 	defvar apk_executable apk
 	defvar mirror http://mirror.fel.cvut.cz/alpine
 	defvar release edge