diff --git a/utilities/platform-util/centos/platform-util.spec b/utilities/platform-util/centos/platform-util.spec
index 4769db23..1071244a 100644
--- a/utilities/platform-util/centos/platform-util.spec
+++ b/utilities/platform-util/centos/platform-util.spec
@@ -62,6 +62,7 @@ install %{_buildsubdir}/scripts/remotelogging_tc_setup.sh %{buildroot}%{local_bi
 install %{_buildsubdir}/scripts/connectivity_test %{buildroot}%{local_bindir}
 install -m 555 %{_buildsubdir}/scripts/update-iso.sh %{buildroot}%{local_bindir}
 install -m 555 %{_buildsubdir}/scripts/gen-bootloader-iso.sh %{buildroot}%{local_bindir}
+install -m 555 %{_buildsubdir}/scripts/stx-iso-utils.sh %{buildroot}%{local_bindir}
 
 install -d %{buildroot}%{local_etc_initd}
 install %{_buildsubdir}/scripts/log_functions.sh %{buildroot}%{local_etc_initd}
@@ -106,6 +107,7 @@ systemctl enable opt-platform.service
 %defattr(-,root,root,-)
 %{local_bindir}/update-iso.sh
 %{local_bindir}/gen-bootloader-iso.sh
+%{local_bindir}/stx-iso-utils.sh
 
 %files noncontroller
 %defattr(-,root,root,-)
diff --git a/utilities/platform-util/scripts/gen-bootloader-iso.sh b/utilities/platform-util/scripts/gen-bootloader-iso.sh
index 4febcab3..0769c05f 100755
--- a/utilities/platform-util/scripts/gen-bootloader-iso.sh
+++ b/utilities/platform-util/scripts/gen-bootloader-iso.sh
@@ -13,6 +13,9 @@
 #
 #
 
+# Source shared utility functions
+source $(dirname $0)/stx-iso-utils.sh
+
 declare LOG_TAG=$(basename $0)
 
 function log_error {
@@ -30,8 +33,6 @@ declare DEFAULT_GRUB_ENTRY=
 declare DEFAULT_LABEL=
 declare DEFAULT_SYSLINUX_ENTRY=
 declare DELETE="no"
-declare EFIBOOT_IMG_LOOP=
-declare EFI_MOUNT=
 declare GRUB_TIMEOUT=-1
 declare INPUT_ISO=
 declare KS_NODETYPE=
@@ -43,10 +44,6 @@ declare -i TIMEOUT=0
 declare UPDATE_TIMEOUT="no"
 declare WWW_ROOT_DIR=
 
-declare MNTDIR=
-declare BUILDDIR=
-declare WORKDIR=
-
 function usage {
     cat <<ENDUSAGE
 Description: Sets up a mini bootimage.iso that includes the minimum required to
@@ -250,161 +247,23 @@ done
 # Functions
 #
 
-function check_requirements {
-    local -a required_utils=(
-        rsync
-        mkisofs
-        isohybrid
-        implantisomd5
-    )
-    if [ $UID -ne 0 ]; then
-        # If running as non-root user, additional utils are required
-        required_utils+=(
-            guestmount
-            guestunmount
-            udisksctl
-        )
-    fi
-
-    local -i missing=0
-
-    for req in ${required_utils[@]}; do
-        which ${req} >&/dev/null
-        if [ $? -ne 0 ]; then
-            log_error "Unable to find required utility: ${req}"
-            let -i missing++
-        fi
-    done
-
-    if [ ${missing} -gt 0 ]; then
-        log_error "One or more required utilities are missing. Aborting..."
-        exit 1
-    fi
-}
-
-function mount_iso {
-    if [ $UID -eq 0 ]; then
-        # Mount the ISO
-        mount -o loop ${INPUT_ISO} ${MNTDIR}
-        if [ $? -ne 0 ]; then
-            log_error "Failed to mount ${INPUT_ISO}"
-            exit 1
-        fi
-    else
-        # As non-root user, mount the ISO using guestmount
-        guestmount -a ${INPUT_ISO} -m /dev/sda1 --ro ${MNTDIR}
-        rc=$?
-        if [ $rc -ne 0 ]; then
-            # Add a retry
-            log_error "Call to guestmount failed with rc=$rc. Retrying once..."
-
-            guestmount -a ${INPUT_ISO} -m /dev/sda1 --ro ${MNTDIR}
-            rc=$?
-            if [ $rc -ne 0 ]; then
-                log_error "Call to guestmount failed with rc=$rc. Aborting..."
-                exit $rc
-            fi
-        fi
-    fi
-}
-
-function unmount_iso {
-    if [ $UID -eq 0 ]; then
-        umount ${MNTDIR}
-    else
-        guestunmount ${MNTDIR}
-    fi
-    rmdir ${MNTDIR}
-}
-
-function mount_efiboot_img {
-    local isodir=$1
-    local efiboot_img=${isodir}/images/efiboot.img
-    local loop_setup_output=
-
-    if [ $UID -eq 0 ]; then
-        # As root, setup a writeable loop device for the
-        # efiboot.img file and mount it
-        loop_setup_output=$(losetup --show -f ${efiboot_img})
-        if [ $? -ne 0 ]; then
-            log_error "Failed losetup"
-            exit 1
-        fi
-
-        EFIBOOT_IMG_LOOP=${loop_setup_output}
-
-        EFI_MOUNT=$(mktemp -d -p /mnt -t EFI-noudev.XXXXXX)
-        mount ${EFIBOOT_IMG_LOOP} ${EFI_MOUNT}
-        if [ $? -ne 0 ]; then
-            log_error "Failed to mount loop device ${EFIBOOT_IMG_LOOP}"
-            exit 1
-        fi
-    else
-        # As non-root user, we can use the udisksctl to setup a loop device
-        # and mount the efiboot.img, with read/write access.
-        loop_setup_output=$(udisksctl loop-setup -f ${efiboot_img} --no-user-interaction)
-        if [ $? -ne 0 ]; then
-            log_error "Failed udisksctl loop-setup"
-            exit 1
-        fi
-
-        EFIBOOT_IMG_LOOP=$(echo ${loop_setup_output} | awk '{print $5;}' | sed -e 's/\.$//g')
-        if [ -z "${EFIBOOT_IMG_LOOP}" ]; then
-            log_error "Failed to determine loop device from command output: ${loop_setup_output}"
-            exit 1
-        fi
-
-        udisksctl mount -b ${EFIBOOT_IMG_LOOP}
-        if [ $? -ne 0 ]; then
-            log_error "Failed udisksctl mount"
-            exit 1
-        fi
-
-        EFI_MOUNT=$(udisksctl info -b ${EFIBOOT_IMG_LOOP} | grep MountPoints | awk '{print $2;}')
-        if [ -z "${EFI_MOUNT}" ]; then
-            log_error "Failed to determine mount point from udisksctl info command"
-            exit 1
-        fi
-    fi
-}
-
-function unmount_efiboot_img {
-    if [ $UID -eq 0 ]; then
-        if [ -n "${EFI_MOUNT}" ]; then
-            mountpoint -q ${EFI_MOUNT} && umount ${EFI_MOUNT}
-            rmdir ${EFI_MOUNT}
-            EFI_MOUNT=
-        fi
-
-        if [ -n "${EFIBOOT_IMG_LOOP}" ]; then
-            losetup -d ${EFIBOOT_IMG_LOOP}
-            EFIBOOT_IMG_LOOP=
-        fi
-    else
-        if [ -n "${EFIBOOT_IMG_LOOP}" ]; then
-            udisksctl unmount -b ${EFIBOOT_IMG_LOOP}
-            udisksctl loop-delete -b ${EFIBOOT_IMG_LOOP}
-            EFI_MOUNT=
-            EFIBOOT_IMG_LOOP=
-        fi
-    fi
-}
-
 function generate_boot_cfg {
+    local isodir=$1
+
     if [ -z "${EFI_MOUNT}" ]; then
-        mount_efiboot_img ${BUILDDIR}
+        mount_efiboot_img ${isodir}
     fi
 
-    KS_URL="${NODE_URL}/miniboot_${KS_NODETYPE}.cfg"
-    BOOT_IP_ARG="${BOOT_IP}::${BOOT_GATEWAY}:${BOOT_NETMASK}:${BOOT_HOSTNAME}:${BOOT_INTERFACE}:none"
+    local KS_URL="${NODE_URL}/miniboot_${KS_NODETYPE}.cfg"
+    local BOOT_IP_ARG="${BOOT_IP}::${BOOT_GATEWAY}:${BOOT_NETMASK}:${BOOT_HOSTNAME}:${BOOT_INTERFACE}:none"
 
-    COMMON_ARGS="inst.text inst.gpt boot_device=sda rootfs_device=sda"
+    local COMMON_ARGS="inst.text inst.gpt boot_device=sda rootfs_device=sda"
     COMMON_ARGS="${COMMON_ARGS} biosdevname=0 usbcore.autosuspend=-1"
     COMMON_ARGS="${COMMON_ARGS} security_profile=standard user_namespace.enable=1"
     COMMON_ARGS="${COMMON_ARGS} inst.repo=${NODE_URL} inst.stage2=${NODE_URL} inst.ks=${KS_URL}"
     COMMON_ARGS="${COMMON_ARGS} ip=${BOOT_IP_ARG}"
 
-    for f in ${BUILDDIR}/isolinux.cfg ${BUILDDIR}/syslinux.cfg; do
+    for f in ${isodir}/isolinux.cfg ${isodir}/syslinux.cfg; do
         cat <<EOF > ${f}
 display splash.cfg
 timeout ${TIMEOUT}
@@ -438,7 +297,7 @@ menu end
 EOF
     done
 
-    for f in ${BUILDDIR}/EFI/BOOT/grub.cfg ${EFI_MOUNT}/EFI/BOOT/grub.cfg; do
+    for f in ${isodir}/EFI/BOOT/grub.cfg ${EFI_MOUNT}/EFI/BOOT/grub.cfg; do
         cat <<EOF > ${f}
 default=${DEFAULT_GRUB_ENTRY}
 timeout=${GRUB_TIMEOUT}
@@ -462,78 +321,12 @@ EOF
     done
 }
 
-function update_parameter {
-    local isodir=$1
-    local param=$2
-    local value=$3
-
-    if [ -z "${EFI_MOUNT}" ]; then
-        mount_efiboot_img ${isodir}
-    fi
-
-    for f in ${isodir}/isolinux.cfg ${isodir}/syslinux.cfg; do
-        grep -q "^[[:space:]]*append\>.*[[:space:]]${param}=" ${f}
-        if [ $? -eq 0 ]; then
-            # Parameter already exists. Update the value
-            sed -i -e "s#^\([[:space:]]*append\>.*${param}\)=[^[:space:]]*#\1=${value}#" ${f}
-            if [ $? -ne 0 ]; then
-                log_error "Failed to update parameter ($param)"
-                exit 1
-            fi
-        else
-            # Parameter doesn't exist. Add it to the cmdline
-            sed -i -e "s|^\([[:space:]]*append\>.*\)|\1 ${param}=${value}|" ${f}
-            if [ $? -ne 0 ]; then
-                log_error "Failed to add parameter ($param)"
-                exit 1
-            fi
-        fi
-    done
-
-    for f in ${isodir}/EFI/BOOT/grub.cfg ${EFI_MOUNT}/EFI/BOOT/grub.cfg; do
-        grep -q "^[[:space:]]*linuxefi\>.*[[:space:]]${param}=" ${f}
-        if [ $? -eq 0 ]; then
-            # Parameter already exists. Update the value
-            sed -i -e "s#^\([[:space:]]*linuxefi\>.*${param}\)=[^[:space:]]*#\1=${value}#" ${f}
-            if [ $? -ne 0 ]; then
-                log_error "Failed to update parameter ($param)"
-                exit 1
-            fi
-        else
-            # Parameter doesn't exist. Add it to the cmdline
-            sed -i -e "s|^\([[:space:]]*linuxefi\>.*\)|\1 ${param}=${value}|" ${f}
-            if [ $? -ne 0 ]; then
-                log_error "Failed to add parameter ($param)"
-                exit 1
-            fi
-        fi
-    done
-}
-
 function cleanup {
-    unmount_efiboot_img
-
-    if [ -n "$MNTDIR" -a -d "$MNTDIR" ]; then
-        unmount_iso
-    fi
-
-    if [ -n "$BUILDDIR" -a -d "$BUILDDIR" ]; then
-        \rm -rf $BUILDDIR
-    fi
-
-    if [ -n "$WORKDIR" -a -d "$WORKDIR" ]; then
-        \rm -rf $WORKDIR
-    fi
+    common_cleanup
 }
 
-function check_required_param {
-    local param="${1}"
-    local value="${2}"
-
-    if [ -z "${value}" ]; then
-        log_error "Required parameter ${param} is not set"
-        exit 1
-    fi
+function check_requirements {
+    common_check_requirements
 }
 
 function handle_delete {
@@ -622,7 +415,7 @@ function extract_node_files {
     fi
 
     # Setup syslinux and grub cfg files
-    generate_boot_cfg
+    generate_boot_cfg ${BUILDDIR}
 
     # Set/update boot parameters
     if [ ${#PARAMS[@]} -gt 0 ]; then
@@ -744,19 +537,13 @@ if [ -d ${NODE_DIR} ]; then
     exit 1
 fi
 
-MNTDIR=$(mktemp -d -p $PWD updateiso_mnt_XXXXXX)
-if [ -z "${MNTDIR}" -o ! -d ${MNTDIR} ]; then
-    log_error "Failed to create mntdir. Aborting..."
-    exit 1
-fi
-
 BUILDDIR=$(mktemp -d -p $PWD updateiso_build_XXXXXX)
 if [ -z "${BUILDDIR}" -o ! -d ${BUILDDIR} ]; then
     log_error "Failed to create builddir. Aborting..."
     exit 1
 fi
 
-mount_iso
+mount_iso ${INPUT_ISO}
 
 # Copy the common files from the ISO, if needed
 extract_shared_files
diff --git a/utilities/platform-util/scripts/stx-iso-utils.sh b/utilities/platform-util/scripts/stx-iso-utils.sh
new file mode 100644
index 00000000..20f00d02
--- /dev/null
+++ b/utilities/platform-util/scripts/stx-iso-utils.sh
@@ -0,0 +1,238 @@
+#!/bin/bash
+#
+# Copyright (c) 2020 Wind River Systems, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Common bash utility functions for StarlingX ISO tools
+#
+
+declare BUILDDIR=
+declare EFIBOOT_IMG_LOOP=
+declare EFI_MOUNT=
+declare MNTDIR=
+declare WORKDIR=
+
+function common_cleanup {
+    unmount_efiboot_img
+
+    if [ -n "$MNTDIR" -a -d "$MNTDIR" ]; then
+        unmount_iso
+    fi
+
+    if [ -n "$BUILDDIR" -a -d "$BUILDDIR" ]; then
+        \rm -rf $BUILDDIR
+    fi
+
+    if [ -n "$WORKDIR" -a -d "$WORKDIR" ]; then
+        \rm -rf $WORKDIR
+    fi
+}
+
+function common_check_requirements {
+    local -a required_utils=(
+        rsync
+        mkisofs
+        isohybrid
+        implantisomd5
+    )
+    if [ $UID -ne 0 ]; then
+        # If running as non-root user, additional utils are required
+        required_utils+=(
+            guestmount
+            guestunmount
+            udisksctl
+        )
+    fi
+
+    local -i missing=0
+
+    for req in ${required_utils[@]}; do
+        which ${req} >&/dev/null
+        if [ $? -ne 0 ]; then
+            log_error "Unable to find required utility: ${req}"
+            let -i missing++
+        fi
+    done
+
+    if [ ${missing} -gt 0 ]; then
+        log_error "One or more required utilities are missing. Aborting..."
+        exit 1
+    fi
+}
+
+function check_required_param {
+    local param="${1}"
+    local value="${2}"
+
+    if [ -z "${value}" ]; then
+        log_error "Required parameter ${param} is not set"
+        exit 1
+    fi
+}
+
+function mount_iso {
+    local input_iso=$1
+
+    MNTDIR=$(mktemp -d -p $PWD stx-iso-utils_mnt_XXXXXX)
+    if [ -z "${MNTDIR}" -o ! -d ${MNTDIR} ]; then
+        log_error "Failed to create mntdir. Aborting..."
+        exit 1
+    fi
+
+    if [ $UID -eq 0 ]; then
+        # Mount the ISO
+        mount -o loop ${input_iso} ${MNTDIR}
+        if [ $? -ne 0 ]; then
+            echo "Failed to mount ${input_iso}" >&2
+            exit 1
+        fi
+    else
+        # As non-root user, mount the ISO using guestmount
+        guestmount -a ${input_iso} -m /dev/sda1 --ro ${MNTDIR}
+        rc=$?
+        if [ $rc -ne 0 ]; then
+            # Add a retry
+            echo "Call to guestmount failed with rc=$rc. Retrying once..."
+
+            guestmount -a ${input_iso} -m /dev/sda1 --ro ${MNTDIR}
+            rc=$?
+            if [ $rc -ne 0 ]; then
+                echo "Call to guestmount failed with rc=$rc. Aborting..."
+                exit $rc
+            fi
+        fi
+    fi
+}
+
+function unmount_iso {
+    if [ $UID -eq 0 ]; then
+        umount ${MNTDIR}
+    else
+        guestunmount ${MNTDIR}
+    fi
+    rmdir ${MNTDIR}
+}
+
+function mount_efiboot_img {
+    local isodir=$1
+    local efiboot_img=${isodir}/images/efiboot.img
+    local loop_setup_output=
+
+    if [ $UID -eq 0 ]; then
+        # As root, setup a writeable loop device for the
+        # efiboot.img file and mount it
+        loop_setup_output=$(losetup --show -f ${efiboot_img})
+        if [ $? -ne 0 ]; then
+            echo "Failed losetup" >&2
+            exit 1
+        fi
+
+        EFIBOOT_IMG_LOOP=${loop_setup_output}
+
+        EFI_MOUNT=$(mktemp -d -p /mnt -t EFI-noudev.XXXXXX)
+        mount ${EFIBOOT_IMG_LOOP} ${EFI_MOUNT}
+        if [ $? -ne 0 ]; then
+            echo "Failed to mount loop device ${EFIBOOT_IMG_LOOP}" >&2
+            exit 1
+        fi
+    else
+        # As non-root user, we can use the udisksctl to setup a loop device
+        # and mount the efiboot.img, with read/write access.
+        loop_setup_output=$(udisksctl loop-setup -f ${efiboot_img} --no-user-interaction)
+        if [ $? -ne 0 ]; then
+            echo "Failed udisksctl loop-setup" >&2
+            exit 1
+        fi
+
+        EFIBOOT_IMG_LOOP=$(echo ${loop_setup_output} | awk '{print $5;}' | sed -e 's/\.$//g')
+        if [ -z "${EFIBOOT_IMG_LOOP}" ]; then
+            echo "Failed to determine loop device from command output:" >&2
+            echo "${loop_setup_output}" >&2
+            exit 1
+        fi
+
+        udisksctl mount -b ${EFIBOOT_IMG_LOOP}
+        if [ $? -ne 0 ]; then
+            echo "Failed udisksctl mount" >&2
+            exit 1
+        fi
+
+        EFI_MOUNT=$(udisksctl info -b ${EFIBOOT_IMG_LOOP} | grep MountPoints | awk '{print $2;}')
+        if [ -z "${EFI_MOUNT}" ]; then
+            echo "Failed to determine mount point from udisksctl info command" >&2
+            exit 1
+        fi
+    fi
+}
+
+function unmount_efiboot_img {
+    if [ $UID -eq 0 ]; then
+        if [ -n "${EFI_MOUNT}" ]; then
+            mountpoint -q ${EFI_MOUNT} && umount ${EFI_MOUNT}
+            rmdir ${EFI_MOUNT}
+            EFI_MOUNT=
+        fi
+
+        if [ -n "${EFIBOOT_IMG_LOOP}" ]; then
+            losetup -d ${EFIBOOT_IMG_LOOP}
+            EFIBOOT_IMG_LOOP=
+        fi
+    else
+        if [ -n "${EFIBOOT_IMG_LOOP}" ]; then
+            udisksctl unmount -b ${EFIBOOT_IMG_LOOP}
+            udisksctl loop-delete -b ${EFIBOOT_IMG_LOOP}
+            EFI_MOUNT=
+            EFIBOOT_IMG_LOOP=
+        fi
+    fi
+}
+
+function update_parameter {
+    local isodir=$1
+    local param=$2
+    local value=$3
+
+    if [ -z "${EFI_MOUNT}" ]; then
+        mount_efiboot_img ${isodir}
+    fi
+
+    for f in ${isodir}/isolinux.cfg ${isodir}/syslinux.cfg; do
+        grep -q "^[[:space:]]*append\>.*[[:space:]]${param}=" ${f}
+        if [ $? -eq 0 ]; then
+            # Parameter already exists. Update the value
+            sed -i -e "s#^\([[:space:]]*append\>.*${param}\)=[^[:space:]]*#\1=${value}#" ${f}
+            if [ $? -ne 0 ]; then
+                log_error "Failed to update parameter ($param)"
+                exit 1
+            fi
+        else
+            # Parameter doesn't exist. Add it to the cmdline
+            sed -i -e "s|^\([[:space:]]*append\>.*\)|\1 ${param}=${value}|" ${f}
+            if [ $? -ne 0 ]; then
+                log_error "Failed to add parameter ($param)"
+                exit 1
+            fi
+        fi
+    done
+
+    for f in ${isodir}/EFI/BOOT/grub.cfg ${EFI_MOUNT}/EFI/BOOT/grub.cfg; do
+        grep -q "^[[:space:]]*linuxefi\>.*[[:space:]]${param}=" ${f}
+        if [ $? -eq 0 ]; then
+            # Parameter already exists. Update the value
+            sed -i -e "s#^\([[:space:]]*linuxefi\>.*${param}\)=[^[:space:]]*#\1=${value}#" ${f}
+            if [ $? -ne 0 ]; then
+                log_error "Failed to update parameter ($param)"
+                exit 1
+            fi
+        else
+            # Parameter doesn't exist. Add it to the cmdline
+            sed -i -e "s|^\([[:space:]]*linuxefi\>.*\)|\1 ${param}=${value}|" ${f}
+            if [ $? -ne 0 ]; then
+                log_error "Failed to add parameter ($param)"
+                exit 1
+            fi
+        fi
+    done
+}
+
diff --git a/utilities/platform-util/scripts/update-iso.sh b/utilities/platform-util/scripts/update-iso.sh
index 2fe551b9..828875a8 100755
--- a/utilities/platform-util/scripts/update-iso.sh
+++ b/utilities/platform-util/scripts/update-iso.sh
@@ -14,6 +14,9 @@
 # the default boot_device and rootfs_device disks
 #
 
+# Source shared utility functions
+source $(dirname $0)/stx-iso-utils.sh
+
 function usage {
     cat <<ENDUSAGE
 Usage:
@@ -66,193 +69,12 @@ EOF
 ENDUSAGE
 }
 
+function cleanup {
+    common_cleanup
+}
+
 function check_requirements {
-    local -a required_utils=(
-        rsync
-        mkisofs
-        isohybrid
-        implantisomd5
-    )
-    if [ $UID -ne 0 ]; then
-        # If running as non-root user, additional utils are required
-        required_utils+=(
-            guestmount
-            guestunmount
-            udisksctl
-        )
-    fi
-
-    local -i missing=0
-
-    for req in ${required_utils[@]}; do
-        which ${req} >&/dev/null
-        if [ $? -ne 0 ]; then
-            echo "Unable to find required utility: ${req}" >&2
-            let -i missing++
-        fi
-    done
-
-    if [ ${missing} -gt 0 ]; then
-        echo "One or more required utilities are missing. Aborting..." >&2
-        exit 1
-    fi
-}
-
-function mount_iso {
-    if [ $UID -eq 0 ]; then
-        # Mount the ISO
-        mount -o loop ${INPUT_ISO} ${MNTDIR}
-        if [ $? -ne 0 ]; then
-            echo "Failed to mount ${INPUT_ISO}" >&2
-            exit 1
-        fi
-    else
-        # As non-root user, mount the ISO using guestmount
-        guestmount -a ${INPUT_ISO} -m /dev/sda1 --ro ${MNTDIR}
-        rc=$?
-        if [ $rc -ne 0 ]; then
-            # Add a retry
-            echo "Call to guestmount failed with rc=$rc. Retrying once..."
-
-            guestmount -a ${INPUT_ISO} -m /dev/sda1 --ro ${MNTDIR}
-            rc=$?
-            if [ $rc -ne 0 ]; then
-                echo "Call to guestmount failed with rc=$rc. Aborting..."
-                exit $rc
-            fi
-        fi
-    fi
-}
-
-function unmount_iso {
-    if [ $UID -eq 0 ]; then
-        umount ${MNTDIR}
-    else
-        guestunmount ${MNTDIR}
-    fi
-    rmdir ${MNTDIR}
-}
-
-function mount_efiboot_img {
-    local isodir=$1
-    local efiboot_img=${isodir}/images/efiboot.img
-    local loop_setup_output=
-
-    if [ $UID -eq 0 ]; then
-        # As root, setup a writeable loop device for the
-        # efiboot.img file and mount it
-        loop_setup_output=$(losetup --show -f ${efiboot_img})
-        if [ $? -ne 0 ]; then
-            echo "Failed losetup" >&2
-            exit 1
-        fi
-
-        EFIBOOT_IMG_LOOP=${loop_setup_output}
-
-        EFI_MOUNT=$(mktemp -d -p /mnt -t EFI-noudev.XXXXXX)
-        mount ${EFIBOOT_IMG_LOOP} ${EFI_MOUNT}
-        if [ $? -ne 0 ]; then
-            echo "Failed to mount loop device ${EFIBOOT_IMG_LOOP}" >&2
-            exit 1
-        fi
-    else
-        # As non-root user, we can use the udisksctl to setup a loop device
-        # and mount the efiboot.img, with read/write access.
-        loop_setup_output=$(udisksctl loop-setup -f ${efiboot_img} --no-user-interaction)
-        if [ $? -ne 0 ]; then
-            echo "Failed udisksctl loop-setup" >&2
-            exit 1
-        fi
-
-        EFIBOOT_IMG_LOOP=$(echo ${loop_setup_output} | awk '{print $5;}' | sed -e 's/\.$//g')
-        if [ -z "${EFIBOOT_IMG_LOOP}" ]; then
-            echo "Failed to determine loop device from command output:" >&2
-            echo "${loop_setup_output}" >&2
-            exit 1
-        fi
-
-        udisksctl mount -b ${EFIBOOT_IMG_LOOP}
-        if [ $? -ne 0 ]; then
-            echo "Failed udisksctl mount" >&2
-            exit 1
-        fi
-
-        EFI_MOUNT=$(udisksctl info -b ${EFIBOOT_IMG_LOOP} | grep MountPoints | awk '{print $2;}')
-        if [ -z "${EFI_MOUNT}" ]; then
-            echo "Failed to determine mount point from udisksctl info command" >&2
-            exit 1
-        fi
-    fi
-}
-
-function unmount_efiboot_img {
-    if [ $UID -eq 0 ]; then
-        if [ -n "${EFI_MOUNT}" ]; then
-            mountpoint -q ${EFI_MOUNT} && umount ${EFI_MOUNT}
-            rmdir ${EFI_MOUNT}
-            EFI_MOUNT=
-        fi
-
-        if [ -n "${EFIBOOT_IMG_LOOP}" ]; then
-            losetup -d ${EFIBOOT_IMG_LOOP}
-            EFIBOOT_IMG_LOOP=
-        fi
-    else
-        if [ -n "${EFIBOOT_IMG_LOOP}" ]; then
-            udisksctl unmount -b ${EFIBOOT_IMG_LOOP}
-            udisksctl loop-delete -b ${EFIBOOT_IMG_LOOP}
-            EFI_MOUNT=
-            EFIBOOT_IMG_LOOP=
-        fi
-    fi
-}
-
-function update_parameter {
-    local isodir=$1
-    local param=$2
-    local value=$3
-
-    if [ -z "${EFI_MOUNT}" ]; then
-        mount_efiboot_img ${isodir}
-    fi
-
-    for f in ${isodir}/isolinux.cfg ${isodir}/syslinux.cfg; do
-        grep -q "^[[:space:]]*append\>.*[[:space:]]${param}=" ${f}
-        if [ $? -eq 0 ]; then
-            # Parameter already exists. Update the value
-            sed -i -e "s#^\([[:space:]]*append\>.*${param}\)=[^[:space:]]*#\1=${value}#" ${f}
-            if [ $? -ne 0 ]; then
-                echo "Failed to update parameter ($param)"
-                exit 1
-            fi
-        else
-            # Parameter doesn't exist. Add it to the cmdline
-            sed -i -e "s|^\([[:space:]]*append\>.*\)|\1 ${param}=${value}|" ${f}
-            if [ $? -ne 0 ]; then
-                echo "Failed to add parameter ($param)"
-                exit 1
-            fi
-        fi
-    done
-
-    for f in ${isodir}/EFI/BOOT/grub.cfg ${EFI_MOUNT}/EFI/BOOT/grub.cfg; do
-        grep -q "^[[:space:]]*linuxefi\>.*[[:space:]]${param}=" ${f}
-        if [ $? -eq 0 ]; then
-            # Parameter already exists. Update the value
-            sed -i -e "s#^\([[:space:]]*linuxefi\>.*${param}\)=[^[:space:]]*#\1=${value}#" ${f}
-            if [ $? -ne 0 ]; then
-                echo "Failed to update parameter ($param)"
-                exit 1
-            fi
-        else
-            # Parameter doesn't exist. Add it to the cmdline
-            sed -i -e "s|^\([[:space:]]*linuxefi\>.*\)|\1 ${param}=${value}|" ${f}
-            if [ $? -ne 0 ]; then
-                echo "Failed to add parameter ($param)"
-                exit 1
-            fi
-        fi
-    done
+    common_check_requirements
 }
 
 function set_default_label {
@@ -330,8 +152,6 @@ declare DEFAULT_GRUB_ENTRY=
 declare UPDATE_TIMEOUT="no"
 declare -i TIMEOUT=0
 declare GRUB_TIMEOUT=-1
-declare EFI_MOUNT=
-declare EFIBOOT_IMG_LOOP=
 
 while getopts "hi:o:a:p:d:t:" opt; do
     case $opt in
@@ -406,10 +226,8 @@ fi
 
 check_requirements
 
-if [ -z "$INPUT_ISO" -o -z "$OUTPUT_ISO" ]; then
-    usage
-    exit 1
-fi
+check_required_param "-i" "${INPUT_ISO}"
+check_required_param "-o" "${OUTPUT_ISO}"
 
 if [ ! -f ${INPUT_ISO} ]; then
     echo "Input file does not exist: ${INPUT_ISO}"
@@ -423,41 +241,15 @@ fi
 
 shift $((OPTIND-1))
 
-declare MNTDIR=
-declare BUILDDIR=
-declare WORKDIR=
-
-function cleanup {
-    unmount_efiboot_img
-
-    if [ -n "$MNTDIR" -a -d "$MNTDIR" ]; then
-        unmount_iso
-    fi
-
-    if [ -n "$BUILDDIR" -a -d "$BUILDDIR" ]; then
-        \rm -rf $BUILDDIR
-    fi
-
-    if [ -n "$WORKDIR" -a -d "$WORKDIR" ]; then
-        \rm -rf $WORKDIR
-    fi
-}
-
 trap cleanup EXIT
 
-MNTDIR=$(mktemp -d -p $PWD updateiso_mnt_XXXXXX)
-if [ -z "${MNTDIR}" -o ! -d ${MNTDIR} ]; then
-    echo "Failed to create mntdir. Aborting..."
-    exit $rc
-fi
-
 BUILDDIR=$(mktemp -d -p $PWD updateiso_build_XXXXXX)
 if [ -z "${BUILDDIR}" -o ! -d ${BUILDDIR} ]; then
     echo "Failed to create builddir. Aborting..."
     exit $rc
 fi
 
-mount_iso
+mount_iso ${INPUT_ISO}
 
 rsync -a ${MNTDIR}/ ${BUILDDIR}/
 rc=$?