From d0f91512d9ca6d361d8a4a387094c48aab00e111 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Tue, 19 Apr 2016 15:10:50 +0200 Subject: fix: ENABLE_CRYPTFS -> UBOOT, SPLITFS, EXPANDROOT - cleanup --- functions.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'functions.sh') diff --git a/functions.sh b/functions.sh index ecf8a4c..f9627cd 100644 --- a/functions.sh +++ b/functions.sh @@ -6,9 +6,9 @@ cleanup (){ # Identify and kill all processes still using files echo "killing processes using mount point ..." - fuser -k "$R" + fuser -k "${R}" sleep 3 - fuser -9 -k -v "$R" + fuser -9 -k -v "${R}" # Clean up temporary .password file if [ -r ".password" ] ; then @@ -17,9 +17,9 @@ cleanup (){ # Clean up all temporary mount points echo "removing temporary mount points ..." - umount -l "$R/proc" 2> /dev/null - umount -l "$R/sys" 2> /dev/null - umount -l "$R/dev/pts" 2> /dev/null + umount -l "${R}/proc" 2> /dev/null + umount -l "${R}/sys" 2> /dev/null + umount -l "${R}/dev/pts" 2> /dev/null umount "$BUILDDIR/mount/boot/firmware" 2> /dev/null umount "$BUILDDIR/mount" 2> /dev/null cryptsetup close "${CRYPTFS_MAPPING}" 2> /dev/null @@ -30,7 +30,7 @@ cleanup (){ chroot_exec() { # Exec command in chroot - LANG=C LC_ALL=C DEBIAN_FRONTEND=noninteractive chroot $R $* + LANG=C LC_ALL=C DEBIAN_FRONTEND=noninteractive chroot ${R} $* } install_readonly() { -- cgit v1.2.3