commit f2bdce8156146ee51b9bd387ec3199bcc938f5a5 parent 26ff72bec2309c26fecd6cac57cddf625c2b4748 Author: parazyd <parazyd@dyne.org> Date: Fri, 30 Sep 2016 10:50:15 +0200 add build_dist Diffstat:
| M | zlibs/bootstrap | | | 1 | + |
| M | zlibs/helpers | | | 17 | +++++++++++++++++ |
| M | zlibs/imaging | | | 4 | ++-- |
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/zlibs/bootstrap b/zlibs/bootstrap @@ -92,6 +92,7 @@ rm -f /thirdstage rm -f /etc/ssh/*_key rm -f /etc/ssh/*.pub rm -f /root/.bash_history +rm -f /usr/bin/qemu-* ## our file for which we check the bootstrap is complete echo "1" > .done rm -f /cleanup diff --git a/zlibs/helpers b/zlibs/helpers @@ -19,6 +19,23 @@ ## helper functions that make your life easier +build_image_dist() { + fn build_image_dist + req=(arch size parted_boot parted_root parted_type) + req+=(workdir strapdir image_name) + ckreq || return 1 + + notice "building complete dist image" + act "$image_name" + + bootstrap_complete_base || zerr + image_prepare_raw || zerr + image_partition_raw_${parted_type} || zerr + build_kernel_${arch} || zerr + rsync_to_raw_image || zerr + image_pack_dist || zerr +} + devprocsys() { fn devprocsys "$@" local watdo="$1" diff --git a/zlibs/imaging b/zlibs/imaging @@ -81,8 +81,8 @@ image_partition_raw_gpt() { sudo mkfs.ext4 -L rootfs $rootpart } -image_package_dist() { - fn image_package_dist +image_pack_dist() { + fn image_pack_dist req=(mappdevice loopdevice image_name strapdir workdir) ckreq || return 1