mrrl-containers

commit 7f69ada3e0eee1cd94f74a0cc12863d575e3730b
parent 07ceb34e55c8135c84a4931c3da504cf179d661f
Author: ccx <ccx@te2000.cz>
Date:   Thu, 29 Feb 2024 18:58:29 +0000

Allow overriding apk and xbps-install command locations

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

1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/zsh-functions/confz_containers_init b/zsh-functions/confz_containers_init
@@ -827,7 +827,7 @@ confz_container_alpine_base_files_check() {
 confz_container_alpine_apk_check() {
 	checkvars sysroot_user root arch
 	defvar keys_dir ${container_alpine_keys_dir:-/etc/apk/keys}
-	defvar apk_executable apk
+	defvar apk_executable ${container_apk_executable:-apk}
 	do_command=(
 		s6-setuidgid $vars[sysroot_user]
 		$vars[apk_executable]
@@ -911,7 +911,7 @@ confz_container_void_base_files_check() {
 
 confz_container_void_xbps_check() {
 	checkvars sysroot_user root arch mirror repository
-	defvar xbps_install_executable xbps-install
+	defvar xbps_install_executable ${container_xbps_install_executable:-xbps-install}
 	do_command=(
 		env XBPS_ARCH=$vars[arch]
 		s6-setuidgid $vars[sysroot_user]
@@ -1081,7 +1081,7 @@ confz_container_nix_image_from_release_check() {
 confz_container_nix_bootstrap_packages_check() {
 	checkvars sysroot_user root arch uid gid
 	defvar keys_dir ${container_alpine_keys_dir:-/etc/apk/keys}
-	defvar apk_executable apk
+	defvar apk_executable ${container_apk_executable:-apk}
 	defvar mirror http://mirror.fel.cvut.cz/alpine
 	defvar release edge
 	defvar repositories main