aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/contrib/mkefidisk.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh
index 28cfb6dd54..b96b7d4f7d 100755
--- a/scripts/contrib/mkefidisk.sh
+++ b/scripts/contrib/mkefidisk.sh
@@ -48,6 +48,8 @@ cleanup() {
fi
}
+trap 'die "Signal Received, Aborting..."' HUP INT TERM
+
# Logging routines
WARNINGS=0
ERRORS=0
@@ -71,7 +73,7 @@ success() {
echo "${GREEN}$1${CLEAR}"
}
die() {
- error $1
+ error "$1"
cleanup
exit 1
}
@@ -288,7 +290,7 @@ unmount_device || die "Failed to unmount $DEVICE partitions"
#
# Format $DEVICE partitions
#
-info "Formating partitions"
+info "Formatting partitions"
debug "Formatting $BOOTFS as vfat"
if [ ! "${DEVICE#/dev/loop}" = "${DEVICE}" ]; then
mkfs.vfat -I $BOOTFS -n "EFI" >$OUT 2>&1 || die "Failed to format $BOOTFS"