devuan-sdk
/
libdevuansdk
mirror of https://github.com/parazyd/libdevuansdk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix path to base-cloud.qcow2 and use [[ instead of [ for test.

This commit is contained in:
parazyd 2018-10-08 15:45:37 +02:00
parent 589d62ca0e
commit c1c6fc8c06
No known key found for this signature in database
GPG Key ID: F0CB28FCF78637DE
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zlibs/vm
View File

@ -174,8 +174,8 @@ vm_init_cloud() {
req=(workdir strapdir imageformat loopdevice) req=(workdir strapdir imageformat loopdevice)
ckreq || return 1 ckreq || return 1
[ -n "$makecloud" ] || return [[ -n "$makecloud" ]] || return
[ "$imageformat" = qcow2 ] || { [[ "$imageformat" = qcow2 ]] || {
die "imageformat is not qcow2" die "imageformat is not qcow2"
zerr zerr
} }
@ -187,6 +187,7 @@ vm_init_cloud() {
notice "Connecting qemu-nbd and mounting" notice "Connecting qemu-nbd and mounting"
sudo mkdir -p "$strapdir" sudo mkdir -p "$strapdir"
sudo qemu-nbd --connect=${loopdevice} base-cloud.qcow2 || zerr sudo qemu-nbd --connect=${loopdevice} base-cloud.qcow2 || zerr
silly sleep 1
sudo mount ${loopdevice}p1 $strapdir || zerr sudo mount ${loopdevice}p1 $strapdir || zerr
notice "Installing cloud-init" notice "Installing cloud-init"
@ -213,8 +214,9 @@ vm_pack_dist() {
mv $workdir/base.${imageformat} $R/dist/${vm_name}.${imageformat} mv $workdir/base.${imageformat} $R/dist/${vm_name}.${imageformat}
cp $workdir/base.vdi $R/dist/${vm_name}.vdi cp $workdir/base.vdi $R/dist/${vm_name}.vdi
[ -n "$makecloud" ] && \ [[ -n "$makecloud" ]] && \
mv base-cloud.${imageformat} $R/dist/${vm_name}-cloud.${imageformat} mv $workdir/base-cloud.${imageformat} \
$R/dist/${vm_name}-cloud.${imageformat}
act "calculating sha256 sums..." act "calculating sha256 sums..."
silly silly
@ -224,7 +226,7 @@ vm_pack_dist() {
$R/dist/${vm_name}.${imageformat}.sha $R/dist/${vm_name}.${imageformat}.sha
sha256sum $R/dist/${vm_name}.vdi > \ sha256sum $R/dist/${vm_name}.vdi > \
$R/dist/${vm_name}.vdi.sha $R/dist/${vm_name}.vdi.sha
[ -n "$makecloud" ] && \ [[ -n "$makecloud" ]] && \
sha256sum $R/dist/${vm_name}-cloud.${imageformat} > \ sha256sum $R/dist/${vm_name}-cloud.${imageformat} > \
$R/dist/${vm_name}-cloud.${imageformat}.sha $R/dist/${vm_name}-cloud.${imageformat}.sha