mrrl-containers

commit 7270187519619c5c8273f3d4c5499206570f40c4
parent e8815f6a910edd1fb2cabe1d489d80c962b5e46d
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Sat, 10 Dec 2022 19:00:02 +0100

Fix location of xbps keys according to current rootfs
Diffstat:
R
container_template/void/var/lib/xbps/db/xbps/keys/3d:b9:c0:50:41:a7:68:4c:2e:2c:a9:a2:5a:04:b7:3f.plist -> container_template/void/var/db/xbps/keys/3d:b9:c0:50:41:a7:68:4c:2e:2c:a9:a2:5a:04:b7:3f.plist
 | 
0

R
container_template/void/var/lib/xbps/db/xbps/keys/60:ae:0c:d6:f0:95:17:80:bc:93:46:7a:89:af:a3:2d.plist -> container_template/void/var/db/xbps/keys/60:ae:0c:d6:f0:95:17:80:bc:93:46:7a:89:af:a3:2d.plist
 | 
0

M
zsh-functions/confz_containers_init
 | 
2
+-

3 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/container_template/void/var/lib/xbps/db/xbps/keys/3d:b9:c0:50:41:a7:68:4c:2e:2c:a9:a2:5a:04:b7:3f.plist b/container_template/void/var/db/xbps/keys/3d:b9:c0:50:41:a7:68:4c:2e:2c:a9:a2:5a:04:b7:3f.plist
diff --git a/container_template/void/var/lib/xbps/db/xbps/keys/60:ae:0c:d6:f0:95:17:80:bc:93:46:7a:89:af:a3:2d.plist b/container_template/void/var/db/xbps/keys/60:ae:0c:d6:f0:95:17:80:bc:93:46:7a:89:af:a3:2d.plist
diff --git a/zsh-functions/confz_containers_init b/zsh-functions/confz_containers_init
@@ -889,7 +889,7 @@ confz_container_void_base_files_check() {
 	defvar gid 0
 
 	local d
-	for d in $vars[root]{,/var{,/lib{,/xbps{,/db{,/xbps{,/keys}}}}}}; do
+	for d in $vars[root]{,/var{,/db{,/xbps{,/keys}}}}; do
 		require fs_d filename="$d"
 		require fs_m filename="$d" mode=0755
 		require fs_o filename="$d" owner=$vars[uid]:$vars[gid]