Imported Upstream version 8.24upstream/8.24upstream

1 files changed, 5 insertions, 4 deletions

diff --git a/init.cfg b/init.cfg
index 725ee121..3beba5a9 100644
--- a/init.cfg
+++ b/init.cfg
@@ -1,6 +1,6 @@
 # This file is sourced by init.sh, *before* its initialization.
 
-# Copyright (C) 2010-2014 Free Software Foundation, Inc.
+# Copyright (C) 2010-2015 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -79,7 +79,7 @@ is_local_dir_()
 require_mount_list_()
 {
   local mount_list_fail='cannot read table of mounted file systems'
-  df 2>&1 | grep -F "$mount_list_fail" >/dev/null &&
+  df --local 2>&1 | grep -F "$mount_list_fail" >/dev/null &&
     skip_ "$mount_list_fail"
 }
 
@@ -400,7 +400,8 @@ nonroot_has_perm_()
   require_built_ chroot
 
   local rm_version=$(
-    chroot --user=$NON_ROOT_USERNAME / env PATH="$PATH" rm --version |
+    chroot --skip-chdir --user=$NON_ROOT_USERNAME / env PATH="$PATH" \
+      rm --version |
     sed -n '1s/.* //p'
   )
   case ":$rm_version:" in
@@ -520,7 +521,7 @@ gcc_shared_()
   local out=$2
   shift 2 || return 1
 
-  $CC -Wall -shared --std=gnu99 -fPIC -ldl -O2 $* "$in" -o "$out"
+  $CC -Wall -shared --std=gnu99 -fPIC -O2 $* "$in" -o "$out" -ldl
 }
 
 # There are a myriad of ways to build shared libs,