apply fixes for a valid build
This commit is contained in:
parent
056c2d943f
commit
a4cf35c5b6
|
|
@ -188,5 +188,5 @@ EOF
|
||||||
[[ -n "$inittab" ]] && { print $inittab | sudo tee -a $strapdir/etc/inittab >/dev/null }
|
[[ -n "$inittab" ]] && { print $inittab | sudo tee -a $strapdir/etc/inittab >/dev/null }
|
||||||
for i in $custmodules; do
|
for i in $custmodules; do
|
||||||
print $i | sudo tee -a $strapdir/etc/modules >/dev/null
|
print $i | sudo tee -a $strapdir/etc/modules >/dev/null
|
||||||
done
|
done || return 0
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -154,14 +154,14 @@ image_raw_umount() {
|
||||||
|
|
||||||
image_raw_as_strapdir() {
|
image_raw_as_strapdir() {
|
||||||
fn image_raw_as_strapdir
|
fn image_raw_as_strapdir
|
||||||
req=(workdir strapdir)
|
req=(workdir strapdir size)
|
||||||
ckreq || return 1
|
ckreq || return 1
|
||||||
|
|
||||||
pushd "$workdir"
|
pushd "$workdir"
|
||||||
|
|
||||||
notice "creating raw image of $size MB"
|
notice "creating raw image of $size MB"
|
||||||
sudo -E rm -f base.raw
|
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"
|
notice "partitioning"
|
||||||
sudo -E parted base.raw mktable msdos
|
sudo -E parted base.raw mktable msdos
|
||||||
sudo -E parted base.raw mkpart primary '0%' '100%'
|
sudo -E parted base.raw mkpart primary '0%' '100%'
|
||||||
|
|
|
||||||
2
zlibs/vm
2
zlibs/vm
|
|
@ -151,7 +151,7 @@ EOF
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
notice "actually packaging..."
|
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
|
popd
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue