=== modified file 'zsh-functions/confz_containers_init' --- old/zsh-functions/confz_containers_init 2022-08-11 01:13:24 +0000 +++ new/zsh-functions/confz_containers_init 2022-08-11 00:22:41 +0000 @@ -1270,26 +1270,23 @@ require container_generic_layout :uid :gid :root #require container_debian_base_files :uid :gid :root require container_debootstrap :root :arch :mirror :suite \ - user=container-$vars[image_name] :uid :gid + user=container-$vars[image_name] } confz_container_debootstrap_check() { - checkvars user root arch mirror suite uid gid + checkvars user root arch mirror suite defvar variant minbase defvar debootstrap_executable debootstrap do_command=( # s6-setuidgid $vars[user] # TODO extra check for chown after debootstrap + $vars[debootstrap_executable] + --variant=$vars[variant] + $vars[suite] # SUITE + $vars[root] # TARGET + $vars[mirror] # MIRROR ) [[ -f $vars[root]/usr/bin/apt-get && -f $vars[root]/usr/bin/sh ]] } -confz_container_debootstrap_do() { - local tmp_root=${vars[root]:h}/.debootstrap.${vars[root]:t} - $vars[debootstrap_executable] --variant=$vars[variant] \ - $vars[suite] $tmp_root $vars[mirror] || return $? - chown -R $vars[uid]:$vars[gid] $tmp_root || return $? - s6-rename $tmp_root $vars[root] || return $? -} -typeset -f -t confz_container_debootstrap_do confz_container_debian_packages_installed_check() { checkvars containers_dir image_name packages svscan_dir