mrrl-containers

commit 5c3db358a92099cbe1cd93580ccb871f69ad1d62
parent 138bfa9a86170baab2e9f3045de07fecb3163fbe
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Tue, 14 Dec 2021 09:53:03 +0000

Add Void signing key
Diffstat:
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
 | 
12
++++++++++++
M
zsh-functions/confz_containers_init
 | 
24
++++++++++++++++++++----

2 files changed, 32 insertions(+), 4 deletions(-)
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/lib/xbps/db/xbps/keys/60:ae:0c:d6:f0:95:17:80:bc:93:46:7a:89:af:a3:2d.plist
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>public-key</key>
+	<data>LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQ0lqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FnOEFNSUlDQ2dLQ0FnRUF2clN6QlpNdmd2T0NJM0FYYk9qYQoycktSa0pTVE0zYy9FalRJZ0NnRFhndW05M0JQQ3RZOE1jRlZvQ1U0T2lYSEdmVG1xMzlCVk5wTHZMSEw5S2sxCnAyNzhTQmhYVk90YkIyRVZtREtudmZJREVUbGRMR3plN3JaTlJKZHR1TjJtWi9UVnJVQjlTMHlRYytJdWY0aHYKMytEOTdWSWRUSkhBN0FTcjA0MjhwcEVHSkd3U1NoWTJYSm05RDVJMEV1R1JXYzE0TUVHN2RJS0ppWWlNMG5FNAp0WW8yL3ZINElGVEhkblZBM2dZaVp5RG5idUNBUi84RVNmVVRVMTNTTkNPZGJ1ZGYzRDVCY3krVWlNREpJM1llCjRNRktCclQ5WmhaK0dzWEJaWTQ4MmxxaVppNkNMNXB0YzlJUUZmOC9lS1phOGphdGtpVkZWZ3JLZU5Sak9UeE4KZldTdTJua3hHTlgrYmhYWXRoaUdXbUpFWThjQ0FQeUZOK0x2NVJldEsyNTZnZGNiMnNrbUVxZWZ2MnpQQyt3VgpXQmJkSDViRDRiWmpuME42Wmw4MXJ2NVJ6RHZudmYrdkQxNGFGVWJaOFFGcXU3NVBiTDR3Nm1ZTTRsZE0vZzBSCjZOWEU4QXo5Qnd4MnREZlllS3V1dHcxRXBQbTJZdkZ5VFViMWNveUF1VEdSeUFhcDFVVEh2ZzlsaFBJSm1oRlEKSjVrQ2cxcUQ3QTMxV2wwUmxuZTZoZ0dvMFpaTko1Y0pNL3YvelNUS0pjdUZnd283SDBoT0dpbDZEZm84OUI0agpHOTZBQ3lQUytEVktQRlhSWXdqL0FrYkhwYVEyZjFGTUFvU3BCcXVEcUhoM3VrazcxS1g2ajE5dDBpRjhEUUxyCnZ0RlNTZElqREEwMmx3ZVY5TmFRcFdzQ0F3RUFBUT09Ci0tLS0tRU5EIFBVQkxJQyBLRVktLS0tLQo=</data>
+	<key>public-key-size</key>
+	<integer>4096</integer>
+	<key>signature-by</key>
+	<string>Void Linux</string>
+</dict>
+</plist>
diff --git a/zsh-functions/confz_containers_init b/zsh-functions/confz_containers_init
@@ -758,8 +758,22 @@ confz_container_alpine_image_check() {
 
 # --- Void ---
 
+confz_container_void_base_files_check() {
+	checkvars root
+	# checkvars hostname locale
+	defvar uid 0
+	defvar gid 0
+
+	require fs_d filename="$vars[root]/var/lib/xbps/db/xbps/keys"
+	require fs_m filename="$vars[root]/var/lib/xbps/db/xbps/keys" mode=0755
+	require fs_o filename="$vars[root]/var/lib/xbps/db/xbps/keys" owner=$vars[uid]:$vars[gid]
+
+	require container_template_file :root :uid :gid \
+		template=void name=var/lib/xbps/db/xbps/keys/60:ae:0c:d6:f0:95:17:80:bc:93:46:7a:89:af:a3:2d.plist
+}
+
 confz_container_void_xbps_check() {
-	checkvars user root arch mirror
+	checkvars user root arch mirror repository
 	defvar xbps_install_executable xbps-install
 	do_command=(
 		env XBPS_ARCH=$vars[arch]
@@ -767,7 +781,7 @@ confz_container_void_xbps_check() {
 		$vars[xbps_install_executable]
 		--sync
 		--rootdir $vars[root]
-		--repository $vars[mirror]
+		--repository $vars[mirror]/$vars[repository]
 		# --yes
 		base-files xbps
 	)
@@ -776,14 +790,16 @@ confz_container_void_xbps_check() {
 
 confz_container_void_image_check() {
 	checkvars containers_dir image_name arch
-	defvar mirror https://mirror.fit.cvut.cz/voidlinux/current
+	defvar mirror https://mirror.fit.cvut.cz/voidlinux/
+	defvar repository current
 	#defvar hostname $vars[image_name]
 	#defvar locale C.UTF-8
 
 	local root=$vars[containers_dir]/systems/$vars[image_name]
 
 	require container_sysroot_user %uid %gid :containers_dir :image_name
-	require container_generic_layout :uid :gid root=$root
+	require container_generic_layout :uid :gid :root
+	require container_void_files :uid :gid :root
 	require container_void_xbps :arch :mirror \
 		root=$root user=container-$vars[image_name]
 }