From c27d84cc80b6fabe7ab23364ac5f7c0eb944ed7c Mon Sep 17 00:00:00 2001 From: Jason Mehring Date: Tue, 14 Oct 2014 17:04:42 -0400 Subject: [PATCH] Renamed umount_image to umount_kill as to better shuit its purpose --- prepare_image | 6 +++--- qubeize_image | 4 ++-- scripts_debian/00_prepare.sh | 6 +++--- scripts_debian/02_install_groups.sh | 6 +++--- scripts_debian/04_install_qubes.sh | 10 +++++----- .../99_custom_configuration.sh | 2 +- .../99_custom_configuration.sh | 2 +- .../02_install_groups_packages_installed.sh | 4 ++-- umount.sh => umount_kill.sh | 12 ++++++------ 9 files changed, 26 insertions(+), 26 deletions(-) rename umount.sh => umount_kill.sh (89%) diff --git a/prepare_image b/prepare_image index edb3489..09f98b0 100755 --- a/prepare_image +++ b/prepare_image @@ -11,7 +11,7 @@ RETCODE=0 : ${DIST=fc14} . ./builder_setup >/dev/null -. ./umount.sh >/dev/null +. ./umount_kill.sh >/dev/null if [ "$VERBOSE" -ge 2 -o "$DEBUG" == "1" ]; then set -x @@ -51,7 +51,7 @@ fi mkdir -p "$INSTALLDIR" mount -o loop "$IMG" "$INSTALLDIR" || exit 1 -trap "umount_image $(readlink -m $INSTALLDIR)" EXIT +trap "umount_kill $(readlink -m $INSTALLDIR)" EXIT "$SCRIPTSDIR/01_install_core.sh" # ------------------------------------------------------------------------------ @@ -66,6 +66,6 @@ echo "-> Installing package groups..." trap - EXIT echo "-> Unmounting prepared_image..." -umount_image "$(readlink -m $INSTALLDIR)" || : +umount_kill "$(readlink -m $INSTALLDIR)" || : exit $RETCODE diff --git a/qubeize_image b/qubeize_image index 08a1efa..703392f 100755 --- a/qubeize_image +++ b/qubeize_image @@ -8,7 +8,7 @@ export NAME="$2" export LC_ALL=POSIX . ./builder_setup >/dev/null -. ./umount.sh >/dev/null +. ./umount_kill.sh >/dev/null if [ "$VERBOSE" -ge 2 -o "$DEBUG" == "1" ]; then set -x @@ -46,7 +46,7 @@ fi # Cleanup function # ------------------------------------------------------------------------------ function cleanup() { - umount_image "$PWD/mnt" || : + umount_kill "$PWD/mnt" || : } trap cleanup ERR diff --git a/scripts_debian/00_prepare.sh b/scripts_debian/00_prepare.sh index c87ccff..a811826 100755 --- a/scripts_debian/00_prepare.sh +++ b/scripts_debian/00_prepare.sh @@ -4,10 +4,10 @@ # ------------------------------------------------------------------------------ # Configurations # ------------------------------------------------------------------------------ -. ./umount.sh >/dev/null +. ./umount_kill.sh >/dev/null INSTALLDIR="$(readlink -m mnt)" -umount_image "$INSTALLDIR" || : +umount_kill "$INSTALLDIR" || : # ------------------------------------------------------------------------------ # Set debug display @@ -39,7 +39,7 @@ if [ -f "$IMG" ]; then fi # Umount image; don't fail if its already umounted - umount_image "$INSTALLDIR" || : + umount_kill "$INSTALLDIR" || : fi # ------------------------------------------------------------------------------ diff --git a/scripts_debian/02_install_groups.sh b/scripts_debian/02_install_groups.sh index 8d57154..80a6c9e 100755 --- a/scripts_debian/02_install_groups.sh +++ b/scripts_debian/02_install_groups.sh @@ -7,7 +7,7 @@ set -x . $SCRIPTSDIR/vars.sh -. ./umount.sh >/dev/null +. ./umount_kill.sh >/dev/null # ------------------------------------------------------------------------------ # If .prepared_debootstrap has not been completed, don't continue @@ -34,7 +34,7 @@ if ! [ -f "$INSTALLDIR/tmp/.prepared_groups" ]; then function error() { echo "--> Install groups error and umount" rm -f "$INSTALLDIR/usr/sbin/policy-rc.d" - umount_image "$INSTALLDIR" || : + umount_kill "$INSTALLDIR" || : exit 1 } trap error ERR @@ -172,7 +172,7 @@ EOF # Kill all processes and umount all mounts within $INSTALLDIR, # but not $INSTALLDIR itself (extra '/' prevents $INSTALLDIR from being # umounted itself) - umount_image "$INSTALLDIR/" || : + umount_kill "$INSTALLDIR/" || : fi # ------------------------------------------------------------------------------ diff --git a/scripts_debian/04_install_qubes.sh b/scripts_debian/04_install_qubes.sh index 2b84b97..423a7d2 100755 --- a/scripts_debian/04_install_qubes.sh +++ b/scripts_debian/04_install_qubes.sh @@ -10,7 +10,7 @@ set -x # Source external scripts # ------------------------------------------------------------------------------ . $SCRIPTSDIR/vars.sh -. ./umount.sh >/dev/null +. ./umount_kill.sh >/dev/null # ------------------------------------------------------------------------------ # If .prepared_groups has not been completed, don't continue @@ -131,20 +131,20 @@ EOF # -------------------------------------------------------------------------- # Update system; exit is not successful # -------------------------------------------------------------------------- - chroot "$INSTALLDIR" apt-get update || { umount_image "$INSTALLDIR"; exit 1; } + chroot "$INSTALLDIR" apt-get update || { umount_kill "$INSTALLDIR"; exit 1; } # -------------------------------------------------------------------------- # Install Qubes packages # -------------------------------------------------------------------------- DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \ chroot "$INSTALLDIR" apt-get -y --force-yes install `cat $SCRIPTSDIR/packages_qubes.list` || \ - { umount_image "$INSTALLDIR"; exit 1; } + { umount_kill "$INSTALLDIR"; exit 1; } # -------------------------------------------------------------------------- # Remove Quebes repo from sources.list.d # -------------------------------------------------------------------------- rm -f "$INSTALLDIR"/etc/apt/sources.list.d/qubes*.list - umount_image "$INSTALLDIR/tmp/qubes_repo" + umount_kill "$INSTALLDIR/tmp/qubes_repo" rm -f "$INSTALLDIR/etc/apt/sources.list.d/qubes-builder.list" chroot "$INSTALLDIR" apt-get update || exit 1 @@ -198,5 +198,5 @@ customStep "$0" "post" # Kill all processes and umount all mounts within $INSTALLDIR, but not # $INSTALLDIR itself (extra '/' prevents $INSTALLDIR from being umounted itself) # ------------------------------------------------------------------------------ -umount_image "$INSTALLDIR/" || : +umount_kill "$INSTALLDIR/" || : diff --git a/scripts_debian/custom_wheezy_whonix-gateway/99_custom_configuration.sh b/scripts_debian/custom_wheezy_whonix-gateway/99_custom_configuration.sh index 6474734..c359eea 100755 --- a/scripts_debian/custom_wheezy_whonix-gateway/99_custom_configuration.sh +++ b/scripts_debian/custom_wheezy_whonix-gateway/99_custom_configuration.sh @@ -5,7 +5,7 @@ # Configurations # ------------------------------------------------------------------------------ . $SCRIPTSDIR/vars.sh -. ./umount.sh >/dev/null +. ./umount_kill.sh >/dev/null if [ "$VERBOSE" -ge 2 -o "$DEBUG" == "1" ]; then set -x diff --git a/scripts_debian/custom_wheezy_whonix-workstation/99_custom_configuration.sh b/scripts_debian/custom_wheezy_whonix-workstation/99_custom_configuration.sh index 73ba84c..5dcba8e 100755 --- a/scripts_debian/custom_wheezy_whonix-workstation/99_custom_configuration.sh +++ b/scripts_debian/custom_wheezy_whonix-workstation/99_custom_configuration.sh @@ -5,7 +5,7 @@ # Configurations # ------------------------------------------------------------------------------ . $SCRIPTSDIR/vars.sh -. ./umount.sh >/dev/null +. ./umount_kill.sh >/dev/null if [ "$VERBOSE" -ge 2 -o "$DEBUG" == "1" ]; then set -x diff --git a/scripts_debian/custom_wheezy_whonix/02_install_groups_packages_installed.sh b/scripts_debian/custom_wheezy_whonix/02_install_groups_packages_installed.sh index 2223777..c437d67 100755 --- a/scripts_debian/custom_wheezy_whonix/02_install_groups_packages_installed.sh +++ b/scripts_debian/custom_wheezy_whonix/02_install_groups_packages_installed.sh @@ -5,7 +5,7 @@ # Configurations # ------------------------------------------------------------------------------ . $SCRIPTSDIR/vars.sh -. ./umount.sh >/dev/null +. ./umount_kill.sh >/dev/null if [ "$VERBOSE" -ge 2 -o "$DEBUG" == "1" ]; then set -x @@ -112,7 +112,7 @@ EOF # ------------------------------------------------------------------------------ function error() { echo "--> Whonix error; umounting $INSTALLDIR to prevent further writes" - umount_image "$INSTALLDIR" || : + umount_kill "$INSTALLDIR" || : exit 1 } trap error ERR diff --git a/umount.sh b/umount_kill.sh similarity index 89% rename from umount.sh rename to umount_kill.sh index 248456a..4d1644e 100755 --- a/umount.sh +++ b/umount_kill.sh @@ -15,17 +15,17 @@ # To kill all processes and mounts within 'chroot-jessie' but keep # 'chroot-jessie' mounted: # -# ./umount.sh chroot-jessie/ +# ./umount_kill.sh chroot-jessie/ # # To kill all processes and mounts within 'chroot-jessie' AND also # umount 'chroot-jessie' mount: # -# ./umount.sh chroot-jessie +# ./umount_kill.sh chroot-jessie # # $1 = full path to mount; # $2 = if set will not umount; only kill processes in mount -umount_image() { +umount_kill() { MOUNTDIR="$1" # We need absolute paths here so we don't kill everything @@ -56,9 +56,9 @@ umount_image() { } kill_processes_in_mount() { - umount_image $1 "false" || : + umount_kill $1 "false" || : } -if [ $(basename "$0") == "umount.sh" -a "$1" ]; then - umount_image "$1" +if [ $(basename "$0") == "umount_kill.sh" -a "$1" ]; then + umount_kill "$1" fi