From 572ca89438dc62bc6ba6ac2aa2702e1f89e8645c Mon Sep 17 00:00:00 2001 From: Steve McIntyre Date: Mon, 23 Jul 2018 05:43:53 +0100 Subject: [PATCH] Fix up handling of the ESP without REAL_HARDWARE --- build-openstack-debian-image | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-openstack-debian-image b/build-openstack-debian-image index 4c9bcb4..6532582 100755 --- a/build-openstack-debian-image +++ b/build-openstack-debian-image @@ -484,6 +484,7 @@ trap "cleanup" EXIT TERM INT if [ "${REAL_HARDWARE}" = "no" ] ; then DEST_PART=/dev/mapper/${LOOP_DEVICE} + DEST_PART_ESP=/dev/mapper/${LOOP_DEVICE_ESP} else if [ "${BOOTTYPE}" = "mbr" ] ; then DEST_PART=/dev/${DEST_HDD}1 @@ -503,7 +504,7 @@ MOUNT_DIR=`mktemp -d -t build-debimg.XXXXXX` mount ${DEST_PART} ${MOUNT_DIR} if [ "${BOOTTYPE}" = "uefi" ] ; then - mkfs.vfat -F ${DEST_PART_ESP} + mkfs.vfat ${DEST_PART_ESP} UUID_ESP=$(blkid -o value -s UUID ${DEST_PART_ESP}) mkdir -p ${MOUNT_DIR}/boot/efi mount ${DEST_PART_ESP} ${MOUNT_DIR}/boot/efi -- GitLab