Clone/future-install-scripts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use intermediate var for chrootdir

Browse Source 
the trap won't necessarily have the same positional parameters.
This commit is contained in:
Dave Reisner 2012-06-20 10:25:18 -04:00
parent 542e888b48
commit 49e855638e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch-chroot.in
View File

@ -17,14 +17,15 @@ if [[ -z $1 || $1 = @(-h|--help) ]]; then
fi
(( EUID == 0 )) || die 'This script must be run with root privileges'
chrootdir=$1
[[ -d $1 ]] || die "Can't create chroot on non-directory %s" "$1"
[[ -d $chrootdir ]] || die "Can't create chroot on non-directory %s" "$1"
trap 'api_fs_umount "$1" 2>/dev/null' EXIT
trap 'api_fs_umount "$chrootdir" 2>/dev/null' EXIT
api_fs_mount "$1" || die "failed to setup API filesystems in chroot %s" "$1"
mount -B /etc/resolv.conf "$1/etc/resolv.conf"
api_fs_mount "$chrootdir" || die "failed to setup API filesystems in chroot %s" "$1"
mount -B /etc/resolv.conf "$chrootdir/etc/resolv.conf"
chroot "$@"
umount "$1/etc/resolv.conf"
umount "$chrootdir/etc/resolv.conf"