add check for empty loopdev to geninstaller

Signed-off-by: Ryan Harper <ryan.harper@canonical.com>
This commit is contained in:
Ryan Harper 2016-06-22 13:30:27 -05:00
parent c8123f9f38
commit 2007d6401b
1 changed files with 4 additions and 0 deletions

View File

@ -520,6 +520,10 @@ generate_img() {
ROOTFS_DEV="/dev/mapper/${loopparts[1]}" ROOTFS_DEV="/dev/mapper/${loopparts[1]}"
OVERLAY_DEV="/dev/mapper/${loopparts[2]}" OVERLAY_DEV="/dev/mapper/${loopparts[2]}"
LOOPDEV="`echo ${kpartx_ret} | fmt -w 1 | grep ^/dev | head -n1`" LOOPDEV="`echo ${kpartx_ret} | fmt -w 1 | grep ^/dev | head -n1`"
[ -z "${LOOPDEV}" ] && {
log "empty loopdev! aieeeeee!";
return 1;
}
log "Building Grub (EFI and BIOS) boot partition" log "Building Grub (EFI and BIOS) boot partition"
(sudo mkfs.vfat -F32 -n GRUB2EFI ${EFI_DEV} 2>/dev/null && (sudo mkfs.vfat -F32 -n GRUB2EFI ${EFI_DEV} 2>/dev/null &&