Merge remote-tracking branch 'falconindy/master'

2 files changed, 24 insertions, 29 deletions

diff --git a/functions b/functions
index 3096aaa..7516345 100644
--- a/functions
+++ b/functions
@@ -549,32 +549,31 @@ mount_all() {
 umount_all() {
 	# $1: restrict to fstype
 
-	local mounts
+	findmnt -mrunRo TARGET,FSTYPE,OPTIONS / | {
+		while read -r target fstype options; do
+			# match only targetted fstypes
+			if [[ $1 && $1 != "$fstype" ]]; then
+				continue
+			fi
 
-	while read -r target fstype options; do
+			# don't unmount API filesystems
+			if [[ $target = /@(proc|sys|run|dev|dev/pts) ]]; then
+				continue
+			fi
 
-		# match only targetted fstypes
-		if [[ $1 && $1 != "$fstype" ]]; then
-			continue
-		fi
+			# avoid networked devices
+			IFS=, read -ra opts <<< "$options"
+			if in_array _netdev "${opts[@]}"; then
+				continue
+			fi
 
-		# don't unmount API filesystems
-		if [[ $target = /@(proc|sys|run|dev|dev/pts) ]]; then
-			continue
-		fi
+			mounts=("$target" "${mounts[@]}")
+		done
 
-		# avoid networked devices
-		IFS=, read -ra opts <<< "$options"
-		if in_array _netdev "${opts[@]}"; then
-			continue
+		if (( ${#mounts[*]} )); then
+			umount -r "${mounts[@]}"
 		fi
-
-		mounts=("$target" "${mounts[@]}")
-	done < <(findmnt -mrunRo TARGET,FSTYPE,OPTIONS /)
-
-	if (( ${#mounts[*]} )); then
-		umount -r "${mounts[@]}"
-	fi
+	}
 
 }
 
diff --git a/locale.sh b/locale.sh
index fe82378..c465f6f 100644
--- a/locale.sh
+++ b/locale.sh
@@ -4,16 +4,12 @@ if [ -s /etc/locale.conf ]; then
 	. /etc/locale.conf
 fi
 
-if [ -n "$LANG" ]; then
-	export LANG
-else
-	if [ -s /etc/rc.conf ]; then
-		export LANG=$(. /etc/rc.conf 2> /dev/null ; echo "$LOCALE")
-	else
-		export LANG="C"
-	fi
+if [ -z "$LANG" ] && [ -s /etc/rc.conf ]; then
+	LANG=$(. /etc/rc.conf 2>/dev/null; echo "$LOCALE")
 fi
 
+export LANG=${LANG:-C}
+
 if [ -n "$LC_CTYPE" ]; then
 	export LC_CTYPE
 else