2 files changed, 3 insertions, 2 deletions
diff --git a/install/autodetect b/install/autodetect
index 3710e68..b3db536 100644
--- a/install/autodetect
+++ b/install/autodetect
@@ -37,7 +37,7 @@ build() {
     fi
 
     # detect filesystem for separate /usr
-    if usrfstype=$(findmnt -snero fstype --tab-file '/etc/fstab' -T '/usr'); then
+    if usrfstype=$(findmnt -snero fstype -T '/usr'); then
         add_if_avail "$usrfstype"
     fi
 
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