mrrl-containers

MRRL version of container scripts
git clone https://ccx.te2000.cz/git/mrrl-containers
Log | Files | Refs

commit 9dd4e5e09cffce33a2c620513dfc229a53b155e2
parent 16dea770ffeddd5463ba61d97642ef22bf093a82
Author: ccx <ccx@te2000.cz>
Date:   Fri, 15 Mar 2024 12:21:57 +0000

support busybox wget

Diffstat:
Mzsh-functions/confz_containers_init | 13+++++--------
1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/zsh-functions/confz_containers_init b/zsh-functions/confz_containers_init @@ -517,16 +517,13 @@ confz_container_download_and_verify_check() { local download_dir=$vars[containers_dir]/download-cache require fs_d filename=$download_dir - do_command=( - $commands[cd] $download_dir - wget --unlink - -O $download_dir/$vars[filename] - -- - $vars[url] - ) (cd $download_dir && $vars[checksum_algo]sum -s -c <<<"$vars[checksum] $vars[filename]") } +confz_container_download_and_verify_do() { + wget -O - -- $vars[url] \ + >$vars[containers_dir]/download-cache/$vars[filename] +} confz_container_generic_layout_check() { checkvars root @@ -1453,7 +1450,7 @@ confz_container_puppet_apt_repo_do() { local deb_file=puppet7-release-$vars[suite].deb s6-setuidgid $vars[sysroot_user] \ - wget --unlink -O $vars[root]/root/$deb_file \ + wget -O - >$vars[root]/root/$deb_file \ https://apt.puppetlabs.com/$deb_file \ || return $? $commands[cd] $vars[sysroot_svc] container_sysroot_run \