From 4d7b01704fe2460f446a9892d63313ae571d45f3 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 2 Nov 2013 18:17:16 -0400 Subject: librechroot: when detecting mount options, set LC_ALL instead of LANG --- src/chroot-tools/librechroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/chroot-tools/librechroot') diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot index b55cae1..0b3a7f1 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[@]}" } -- cgit v1.2.3-2-g168b From c28a7d64bd9f10236a255c284442b1526c6b7990 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 3 Nov 2013 10:48:38 -0500 Subject: librechroot: correct comment --- src/chroot-tools/librechroot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/chroot-tools/librechroot') diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot index 0b3a7f1..5e16587 100755 --- a/src/chroot-tools/librechroot +++ b/src/chroot-tools/librechroot @@ -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; -- cgit v1.2.3-2-g168b