From 8debe95b61b1ca3f2cfce5695c33ba6ff8ecc9fa Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Thu, 28 Mar 2019 15:10:16 -0600 Subject: [PATCH 1/2] image-builder: add fs type Add filesystem type to format the loop device. fixes #270 Signed-off-by: Julio Montes --- image-builder/image_builder.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/image-builder/image_builder.sh b/image-builder/image_builder.sh index d2d622e64c..e32c23184d 100755 --- a/image-builder/image_builder.sh +++ b/image-builder/image_builder.sh @@ -194,7 +194,7 @@ calculate_required_disk_size() { continue fi - format_loop "${device}" "${block_size}" > /dev/null 2>&1 + format_loop "${device}" "${block_size}" "${fs_type}" > /dev/null 2>&1 mount "${device}p1" "${mount_dir}" avail="$(df -h --output=avail "${mount_dir}" | tail -n1 | sed 's/[M ]//g')" umount "${mount_dir}" @@ -264,6 +264,7 @@ setup_loop_device() { format_loop() { local device="$1" local block_size="$2" + local fs_type="$3" case "${fs_type}" in "${ext4_format}") @@ -316,7 +317,7 @@ create_rootfs_image() { die "Could not setup loop device" fi - format_loop "${device}" "${block_size}" + format_loop "${device}" "${block_size}" "${fs_type}" info "Mounting root partition" readonly mount_dir=$(mktemp -d osbuilder-mount-dir.XXXX) From 77fb8085f41355be2470f7103e174b8cfe500ba7 Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Fri, 29 Mar 2019 07:47:22 -0600 Subject: [PATCH 2/2] image-builder: check format_loop return code check format_loop return code and die if it fails Signed-off-by: Julio Montes --- image-builder/image_builder.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/image-builder/image_builder.sh b/image-builder/image_builder.sh index e32c23184d..9393d8b9f0 100755 --- a/image-builder/image_builder.sh +++ b/image-builder/image_builder.sh @@ -194,7 +194,9 @@ calculate_required_disk_size() { continue fi - format_loop "${device}" "${block_size}" "${fs_type}" > /dev/null 2>&1 + if ! format_loop "${device}" "${block_size}" "${fs_type}" > /dev/null 2>&1 ; then + die "Could not format loop device: ${device}" + fi mount "${device}p1" "${mount_dir}" avail="$(df -h --output=avail "${mount_dir}" | tail -n1 | sed 's/[M ]//g')" umount "${mount_dir}" @@ -317,7 +319,9 @@ create_rootfs_image() { die "Could not setup loop device" fi - format_loop "${device}" "${block_size}" "${fs_type}" + if ! format_loop "${device}" "${block_size}" "${fs_type}"; then + die "Could not format loop device: ${device}" + fi info "Mounting root partition" readonly mount_dir=$(mktemp -d osbuilder-mount-dir.XXXX)