From a9acf88c1dda80acd3de5d08f61a7e452fdc4510 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sat, 21 Jan 2012 16:46:54 -0500 Subject: use --tab-file flag for findmnt -s Behavior changed in util-linux commit 2f1ac44b4b. Signed-off-by: Dave Reisner --- init | 7 ++++--- install/autodetect | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/init b/init index b596a68..bb9401d 100644 --- a/init +++ b/init @@ -88,9 +88,10 @@ elif [ ! -x "/new_root${init}" ]; then fi # mount /usr if it exists -if [ -f /new_root/etc/fstab ]; then - if usr_source=$(findmnt -nero source -s/new_root/etc/fstab /usr); then - mountopts=$(findmnt -nero options -s/new_root/etc/fstab /usr) +realtab=/new_root/etc/fstab +if [ -f "$realtab" ]; then + if usr_source=$(findmnt -snero source --tab-file="$realtab" /usr); then + mountopts=$(findmnt -snero options --tab-file="$realtab" /usr) fsck_device "$usr_source" mount "$usr_source" /new_root/usr -o "$mountopts" fi diff --git a/install/autodetect b/install/autodetect index cc12124..1b5b438 100644 --- a/install/autodetect +++ b/install/autodetect @@ -34,7 +34,7 @@ build() { add_if_avail "$rootfstype" # detect separate /usr - if usrfstype=$(findmnt -nero fstype -s"$BASEDIR/etc/fstab" /usr); then + if usrfstype=$(findmnt -snero fstype --tab-file "$BASEDIR/etc/fstab" /usr); then add_if_avail "$usrfstype" fi -- cgit v1.2.3-24-g4f1b