=== modified file 'zsh-functions/confz_containers_init'
--- old/zsh-functions/confz_containers_init	2021-12-16 18:54:36 +0000
+++ new/zsh-functions/confz_containers_init	2021-12-16 16:52:37 +0000
@@ -827,27 +827,3 @@
 	require container_void_xbps :arch :mirror :repository \
 		:root user=container-$vars[image_name]
 }
-
-confz_container_void_packages_installed_check() {
-	checkvars containers_dir image_name packages svscan_dir
-
-	require container_service_sysroot :containers_dir :svscan_dir \
-		:image_name
-
-	local root=$vars[containers_dir]/systems/$vars[image_name]
-	local -a missing
-	local pkg
-
-	for pkg in $=vars[packages]; do
-		[[ -f $root/var/db/xbps/.${pkg}-files.plist ]] || missing+=( $pkg )
-	done
-
-	do_command=(
-		$commands[cd] $vars[svscan_dir]/container.$vars[image_name].sysroot
-		container_sysroot_run
-		/usr/sbin/xbps-install --sync -- $missing
-	)
-
-	(( $#missing == 0 ))
-}
-

=== modified file 'zsh-functions/confz_site_containers_init'
--- old/zsh-functions/confz_site_containers_init	2021-12-16 18:54:36 +0000
+++ new/zsh-functions/confz_site_containers_init	2021-12-16 17:20:49 +0000
@@ -41,30 +41,9 @@
 		image_name=alpine-dev
 }
 
-confz_site_container_alpine_check() {
-	checkvars containers_dir svscan_dir image_name packages
-	defvar arch x86_64
-
-	require container_alpine_image \
-		:containers_dir :arch :image_name
-	require container_alpine_packages_installed \
-		:containers_dir :svscan_dir :image_name :packages
-}
-
-confz_site_container_void_musl_check() {
-	checkvars containers_dir svscan_dir image_name packages
-	defvar arch x86_64-musl 
-	defvar repository=current/musl
-
-	require container_void_image \
-		:containers_dir :arch :repository :image_name
-	require container_void_packages_installed \
-		:containers_dir :svscan_dir :image_name :packages
-}
-
 confz_site_container_images_check() {
-	checkvars containers_dir svscan_dir
-
+	defvar containers_dir /mnt/volumes/containers
+	defvar svscan_dir /run/service
 	local -a alpine_core=(
 		# abduco
 		s6
@@ -74,27 +53,19 @@
 		# rxvt-unicode-terminfo
 		zsh
 	)
-	require site_container_alpine :containers_dir :svscan_dir \
+	require container_alpine_image :containers_dir arch=x86_64 \
+		image_name=alpine-sndio
+	require container_alpine_packages_installed :containers_dir :svscan_dir \
 		image_name=alpine-sndio packages="$alpine_core"
-
-	local -a void_core=(
-		abduco
-		s6
-		s6-{rc,linux-utils,portable-utils}
-		execline
-		ncurses-base
-		rxvt-unicode-terminfo
-		zsh
-	)
-	require site_container_void_musl :containers_dir :svscan_dir \
-		image_name=void-browsers packages="$void_core"
+	require container_void_image :containers_dir arch=x86_64-musl \
+		repository=current/musl image_name=void-browsers
 }
 
 confz_site_containers_check() {
 	defvar containers_dir /mnt/volumes/containers
 	defvar svscan_dir /run/service
 	require site_container_services :containers_dir :svscan_dir
-	require site_container_images :containers_dir :svscan_dir
+	require site_container_images :containers_dir
 }
 
 confz_container_sysroot_rundir_check() {