From 2fa58ec7710c9f08d1422ff223bc5276703905ab Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@parabola.nu>
Date: Thu, 16 Feb 2017 14:39:15 -0500
Subject: makechrootpkg: Detect the chroottype in individual functions, not
 globally.

---
 makechrootpkg.in | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'makechrootpkg.in')

diff --git a/makechrootpkg.in b/makechrootpkg.in
index cdc3a93..f90e20d 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -180,8 +180,6 @@ btrfs_subvolume_delete() {
 }
 
 # Usage: sync_chroot $CHROOTDIR/$CHROOT <$CHROOTCOPY|$copydir>
-# Globals:
-#  - chroottype
 sync_chroot() {
 	local chrootdir=$1
 	local copy=$2
@@ -197,6 +195,9 @@ sync_chroot() {
 		return 1
 	fi
 
+	# Detect chrootdir filesystem type
+	local chroottype=$(stat -f -c %T "$chrootdir")
+
 	# Get a read lock on the root chroot to make
 	# sure we don't clone a half-updated chroot
 	slock 8 "$chrootdir/root.lock" \
@@ -224,10 +225,10 @@ sync_chroot() {
 }
 
 # Usage: delete_chroot $copydir
-# Globals:
-#  - chroottype
 delete_chroot() {
 	local copydir=$1
+	# Detect chrootdir filesystem type
+	local chroottype=$(stat -f -c %T "$copydir")
 
 	stat_busy "Removing chroot copy [%s]" "$copydir"
 	if [[ "$chroottype" == btrfs ]] && ! mountpoint -q "$copydir"; then
@@ -418,9 +419,6 @@ chrootdir=$(readlink -e "$passeddir")
 [[ ! -d $chrootdir ]] && die "No chroot dir defined, or invalid path '%s'" "$passeddir"
 [[ ! -d $chrootdir/root ]] && die "Missing chroot dir root directory. Try using: mkarchroot %s/root base-devel" "$chrootdir"
 
-# Detect chrootdir filesystem type
-chroottype=$(stat -f -c %T "$chrootdir")
-
 if [[ ${copy:0:1} = / ]]; then
 	copydir=$copy
 else
-- 
cgit v1.2.3-54-g00ecf