summaryrefslogtreecommitdiffstats
path: root/mkinitcpio
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2013-08-27 23:51:31 +0200
committerDave Reisner <dreisner@archlinux.org>2013-08-28 13:37:50 +0200
commit60475ade761e85ef2c1b0f2daef569b134d44fc0 (patch)
tree4c679526df3a1269dced67b80cc59f44b9393818 /mkinitcpio
parent31e5439dd5a78d413a77a79ffa8179815a02570c (diff)
downloadmkinitcpio-60475ade761e85ef2c1b0f2daef569b134d44fc0.tar.gz
mkinitcpio-60475ade761e85ef2c1b0f2daef569b134d44fc0.tar.xz
rely on libmount defaults for file locations
Using --tab-file for findmnt calls is redundant if we can rely on the defaults. Sanitize the environment from any LIBMOUNT_* variables so that we can be sure of what file we're reading. Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Diffstat (limited to 'mkinitcpio')
-rwxr-xr-xmkinitcpio3
1 files changed, 2 insertions, 1 deletions
diff --git a/mkinitcpio b/mkinitcpio
index 0ae6913..2d8c579 100755
--- a/mkinitcpio
+++ b/mkinitcpio
@@ -31,7 +31,8 @@ export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
# Sanitize environment further
# GREP_OPTIONS="--color=always" will break everything
# CDPATH can affect cd and pushd
-unset GREP_OPTIONS CDPATH
+# LIBMOUNT_* options can affect findmnt and other tools
+unset GREP_OPTIONS CDPATH "${!LIBMOUNT_@}"
usage() {
cat <<EOF