diff options
| author | Jan Wagner <mail@jwagner.eu> | 2016-04-19 15:10:50 +0200 |
|---|---|---|
| committer | Jan Wagner <mail@jwagner.eu> | 2016-04-19 15:10:50 +0200 |
| commit | d0f91512d9ca6d361d8a4a387094c48aab00e111 (patch) | |
| tree | b00ed220e2fa04bdb1db43475a8149d01d1be5db /functions.sh | |
| parent | 7878e85af7748d531a64f459723dca76ee37914b (diff) | |
| download | rpi2-gen-image-d0f91512d9ca6d361d8a4a387094c48aab00e111.tar.gz rpi2-gen-image-d0f91512d9ca6d361d8a4a387094c48aab00e111.tar.bz2 rpi2-gen-image-d0f91512d9ca6d361d8a4a387094c48aab00e111.zip | |
Diffstat (limited to 'functions.sh')
| -rw-r--r-- | functions.sh | 12 |
1 files changed, 6 insertions, 6 deletions
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() { |