Merge branch 'master' into xbs

Conflicts:
	src/lib/conf.sh

1 files changed, 3 insertions, 3 deletions

diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot
index b55cae1..5e16587 100755
--- a/src/chroot-tools/librechroot
+++ b/src/chroot-tools/librechroot
@@ -178,7 +178,7 @@ calculate_directories() {
 check_mountpoint() {
 	local file=$1
 	local mountpoint="$(df -P "$file"|sed '1d;s/.*\s//')"
-	local mountopts=($(LANG=C mount|awk "{ if (\$3==\"$mountpoint\") { gsub(/[(,)]/, \" \", \$6); print \$6 } }"))
+	local mountopts=($(LC_ALL=C mount|awk "{ if (\$3==\"$mountpoint\") { gsub(/[(,)]/, \" \", \$6); print \$6 } }"))
 	! in_array nosuid "${mountopts[@]}" && ! in_array noexec "${mountopts[@]}"
 }
 
@@ -190,8 +190,8 @@ arch-nspawn() {
 	if [[ -t 1 ]]; then
 		cmd=("$@")
 	else
-		# This perl script is equivalent to `sed -s 's|\n|\r\n|g', but
-		# it doesn't line-buffer.
+		# This perl script is similar to `sed 's|\n|\r\n|g'`, (or, more
+		# correctly, `sed 's|$|\r|'`) but it does't line-buffer.
 		local perlcmd='
 my $size;
 my $buffer;