diff --git a/image_to_vm.sh b/image_to_vm.sh index ae3aaab72f..695111f52c 100755 --- a/image_to_vm.sh +++ b/image_to_vm.sh @@ -150,8 +150,8 @@ dd if="${SRC_IMAGE}" of="${TEMP_PMBR}" bs=512 count=1 TEMP_MNT=$(mktemp -d) TEMP_ESP_MNT=$(mktemp -d) cleanup() { - sudo umount -d "${TEMP_MNT}" - sudo umount -d "${TEMP_ESP_MNT}" + sudo umount "${TEMP_MNT}" + sudo umount "${TEMP_ESP_MNT}" rmdir "${TEMP_MNT}" "${TEMP_ESP_MNT}" } trap cleanup INT TERM EXIT diff --git a/mod_image_for_recovery.sh b/mod_image_for_recovery.sh index fae75e281f..e48b0ae5c7 100755 --- a/mod_image_for_recovery.sh +++ b/mod_image_for_recovery.sh @@ -77,7 +77,7 @@ get_install_vblock() { sudo cp "$stateful_mnt/vmlinuz_hd.vblock" "$out" sudo chown $USER "$out" - sudo umount -d "$stateful_mnt" + sudo umount "$stateful_mnt" rmdir "$stateful_mnt" set -e echo "$out" @@ -243,7 +243,7 @@ install_recovery_kernel() { local esp_mnt=$(mktemp -d) sudo mount -o loop,offset=$((esp_offset * 512)) "$RECOVERY_IMAGE" "$esp_mnt" sudo cp "$vmlinuz" "$esp_mnt/syslinux/vmlinuz.A" || failed=1 - sudo umount -d "$esp_mnt" + sudo umount "$esp_mnt" rmdir "$esp_mnt" set -e fi @@ -323,7 +323,7 @@ maybe_resize_stateful() { sudo mount -o loop $small_stateful $new_stateful_mnt sudo cp "$INSTALL_VBLOCK" "$new_stateful_mnt/vmlinuz_hd.vblock" sudo mkdir "$new_stateful_mnt/var" - sudo umount -d "$new_stateful_mnt" + sudo umount "$new_stateful_mnt" rmdir "$new_stateful_mnt" set -e diff --git a/mount_gpt_image.sh b/mount_gpt_image.sh index 7c9a8d9c8b..ae6aa4032b 100755 --- a/mount_gpt_image.sh +++ b/mount_gpt_image.sh @@ -86,10 +86,10 @@ function unmount_image() { sudo umount "${FLAGS_rootfs_mountpt}/usr/local" sudo umount "${FLAGS_rootfs_mountpt}/var" if [[ -n "${FLAGS_esp_mountpt}" ]]; then - sudo umount -d "${FLAGS_esp_mountpt}" + sudo umount "${FLAGS_esp_mountpt}" fi - sudo umount -d "${FLAGS_stateful_mountpt}" - sudo umount -d "${FLAGS_rootfs_mountpt}" + sudo umount "${FLAGS_stateful_mountpt}" + sudo umount "${FLAGS_rootfs_mountpt}" set -e }