From a4cf35c5b6082405346a43ac5cda48eeebaabd4a Mon Sep 17 00:00:00 2001 From: parazyd Date: Tue, 14 Feb 2017 18:46:21 +0100 Subject: [PATCH] apply fixes for a valid build --- zlibs/bootstrap | 2 +- zlibs/imaging | 4 ++-- zlibs/vm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zlibs/bootstrap b/zlibs/bootstrap index 2c21c3b..f1a70d2 100644 --- a/zlibs/bootstrap +++ b/zlibs/bootstrap @@ -188,5 +188,5 @@ EOF [[ -n "$inittab" ]] && { print $inittab | sudo tee -a $strapdir/etc/inittab >/dev/null } for i in $custmodules; do print $i | sudo tee -a $strapdir/etc/modules >/dev/null - done + done || return 0 } diff --git a/zlibs/imaging b/zlibs/imaging index 4306380..6e1bc2a 100644 --- a/zlibs/imaging +++ b/zlibs/imaging @@ -154,14 +154,14 @@ image_raw_umount() { image_raw_as_strapdir() { fn image_raw_as_strapdir - req=(workdir strapdir) + req=(workdir strapdir size) ckreq || return 1 pushd "$workdir" notice "creating raw image of $size MB" sudo -E rm -f base.raw - sudo -E qemu-img create -f raw base.raw + sudo -E qemu-img create -f raw base.raw ${size}M notice "partitioning" sudo -E parted base.raw mktable msdos sudo -E parted base.raw mkpart primary '0%' '100%' diff --git a/zlibs/vm b/zlibs/vm index 3ebd7ea..97218d3 100644 --- a/zlibs/vm +++ b/zlibs/vm @@ -151,7 +151,7 @@ EOF } EOF notice "actually packaging..." - vagrant package --base "$vmname" --outbut devuanbox.box --include metadata.json --vagrantfile Vagrantfile || zerr + vagrant package --base "$vmname" --output devuanbox.box --include metadata.json --vagrantfile Vagrantfile || zerr popd }