summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2013-04-25 10:23:51 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-29 14:43:49 +0100
commitf522ff19ba4b80788d66a2c58ee50b86fdfea15f (patch)
tree5fddfcfe000ed8a07d749dda4b3da7e590207c42 /scripts
parentc03d438defea242f437b7483ba2412a5bf2b9adb (diff)
downloadopenembedded-core-f522ff19ba4b80788d66a2c58ee50b86fdfea15f.tar.gz
mkefidisk: Attempt to automatically unmount target device
With automounters abounding it makes more sense to attempt to unmount the device rather than abort, just like ddimage does. Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/contrib/mkefidisk.sh13
1 files changed, 9 insertions, 4 deletions
diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh
index acadd49774..741c3ab967 100755
--- a/scripts/contrib/mkefidisk.sh
+++ b/scripts/contrib/mkefidisk.sh
@@ -102,10 +102,14 @@ fi
#
grep -q $DEVICE /proc/mounts
if [ $? -eq 0 ]; then
- echo "ERROR: $DEVICE partitions mounted:"
- grep $DEVICE /proc/mounts | cut -f 1 -d " "
- echo "Unmount the partitions listed and try again."
- exit 1
+ echo -n "$DEVICE listed in /proc/mounts, attempting to unmount..."
+ umount $DEVICE* 2>/dev/null
+ grep -q $DEVICE /proc/mounts
+ if [ $? -eq 0 ]; then
+ echo "FAILED"
+ exit 1
+ fi
+ echo "OK"
fi
@@ -153,6 +157,7 @@ echo "Boot partition size: $BOOT_SIZE MB ($BOOTFS)"
echo "ROOTFS partition size: $ROOTFS_SIZE MB ($ROOTFS)"
echo "Swap partition size: $SWAP_SIZE MB ($SWAP)"
echo "*****************"
+
echo "Deleting partition table on $DEVICE ..."
dd if=/dev/zero of=$DEVICE bs=512 count=2