findmnt: add --mountpoint command line option

The current --target <path> implementation check the <path> elements in
reverse order to get the mountpoint. The feature may be inwanted in
some cases when we really want to check for mountpoint specified by
the <path>. The new option "--mountpoint <path>" allows to be strict.

Signed-off-by: Karel Zak <kzak@redhat.com>

5 files changed, 15 insertions, 15 deletions

diff --git a/tests/ts/mount/fstab-broken b/tests/ts/mount/fstab-broken
index 5934c22d3..2f0f63cae 100755
--- a/tests/ts/mount/fstab-broken
+++ b/tests/ts/mount/fstab-broken
@@ -39,7 +39,7 @@ ts_fstab_close
 
 ts_init_subtest "mount"
 $TS_CMD_MOUNT $MNT &> /dev/null
-$TS_CMD_FINDMNT --kernel --target "$MNT" &> /dev/null
+$TS_CMD_FINDMNT --kernel --mountpoint "$MNT" &> /dev/null
 if [ "$?" != "0" ]; then
 	ts_log "Cannot find $MNT in /proc/self/mountinfo"
 else
@@ -51,7 +51,7 @@ ts_finalize_subtest
 
 ts_init_subtest "mount-all"
 $TS_CMD_MOUNT -a &> /dev/null
-$TS_CMD_FINDMNT --kernel --target "$MNT" &> /dev/null
+$TS_CMD_FINDMNT --kernel --mountpoint "$MNT" &> /dev/null
 if [ "$?" != "0" ]; then
 	ts_log "Cannot find $MNT in /proc/self/mountinfo"
 else
diff --git a/tests/ts/mount/fstab-none b/tests/ts/mount/fstab-none
index 64eb48bbf..f4684b11c 100755
--- a/tests/ts/mount/fstab-none
+++ b/tests/ts/mount/fstab-none
@@ -20,10 +20,10 @@ mkdir -p $TS_MOUNTPOINT
 
 $TS_CMD_MOUNT $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
 
-$TS_CMD_FINDMNT --target "$TS_MOUNTPOINT" &> /dev/null
+$TS_CMD_FINDMNT --mountpoint "$TS_MOUNTPOINT" &> /dev/null
 [ $? -eq 0 ] || ts_die "Not found target (mount failed?)"
 
-$TS_CMD_FINDMNT --source "none" --target "$TS_MOUNTPOINT" &> /dev/null
+$TS_CMD_FINDMNT --source "none" --mountpoint "$TS_MOUNTPOINT" &> /dev/null
 [ $? -eq 0 ] || ts_die "Not found source and target"
 
 $TS_CMD_UMOUNT $TS_MOUNTPOINT || ts_die "Cannot umount $TS_MOUNTPOINT"
diff --git a/tests/ts/mount/move b/tests/ts/mount/move
index 524488777..1e50d01d4 100755
--- a/tests/ts/mount/move
+++ b/tests/ts/mount/move
@@ -49,14 +49,14 @@ $TS_CMD_MOUNT --make-private $DIR_PRIVATE
 $TS_CMD_MOUNT --bind $DIR_SRC $DIR_A
 
 # check the bind
-$TS_CMD_FINDMNT --kernel --target "$DIR_A" &> /dev/null
+$TS_CMD_FINDMNT --kernel --mountpoint "$DIR_A" &> /dev/null
 [ "$?" == "0" ] || ts_die "Cannot find binded $DIR_A in /proc/self/mountinfo"
 
 # move
 $TS_CMD_MOUNT --move $DIR_A $DIR_B
 
 # check the move
-$TS_CMD_FINDMNT --kernel --target "$DIR_B" &> /dev/null
+$TS_CMD_FINDMNT --kernel --mountpoint "$DIR_B" &> /dev/null
 [ "$?" == "0" ] || ts_die "Cannot find binded $DIR_B in /proc/self/mountinfo"
 
 # clean up
diff --git a/tests/ts/mount/remount b/tests/ts/mount/remount
index 99ede4a75..6814e313e 100755
--- a/tests/ts/mount/remount
+++ b/tests/ts/mount/remount
@@ -48,7 +48,7 @@ $TS_CMD_MOUNT -o remount,ro $TS_MOUNTPOINT \
  || ts_die "Cannot remount $TS_MOUNTPOINT" $DEVICE
 
 # check the remount
-$TS_CMD_FINDMNT --kernel --target "$TS_MOUNTPOINT" --options "ro" &> /dev/null
+$TS_CMD_FINDMNT --kernel --mountpoint "$TS_MOUNTPOINT" --options "ro" &> /dev/null
 [ "$?" == "0" ] || ts_die "Cannot find read-only in $TS_MOUNTPOINT in /proc/self/mountinfo"
 
 ts_device_deinit $DEVICE
diff --git a/tests/ts/mount/shared-subtree b/tests/ts/mount/shared-subtree
index 45154835d..2f8f5b90a 100755
--- a/tests/ts/mount/shared-subtree
+++ b/tests/ts/mount/shared-subtree
@@ -20,7 +20,7 @@ ts_check_losetup
 $TS_CMD_MOUNT --bind $TS_MOUNTPOINT $TS_MOUNTPOINT
 
 # check the bind
-$TS_CMD_FINDMNT --kernel --target $TS_MOUNTPOINT  &> /dev/null
+$TS_CMD_FINDMNT --kernel --mountpoint $TS_MOUNTPOINT  &> /dev/null
 [ "$?" == "0" ] || ts_die "Cannot find binded $TS_MOUNTPOINT in /proc/self/mountinfo"
 
 # use the same mounpoint for all sub-tests
@@ -29,18 +29,18 @@ MOUNTPOINT="$TS_MOUNTPOINT"
 
 ts_init_subtest "make-shared"
 $TS_CMD_MOUNT --make-shared $MOUNTPOINT >> $TS_OUTPUT 2>&1
-$TS_CMD_FINDMNT -nr --target $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
+$TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
 ts_finalize_subtest
 
 ts_init_subtest "make-private"
 $TS_CMD_MOUNT --make-private $MOUNTPOINT >> $TS_OUTPUT 2>&1
-$TS_CMD_FINDMNT -nr --target $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
+$TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
 ts_finalize_subtest
 
 
 ts_init_subtest "make-unbindable"
 $TS_CMD_MOUNT --make-unbindable $MOUNTPOINT >> $TS_OUTPUT 2>&1
-$TS_CMD_FINDMNT -nr --target $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
+$TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
 ts_finalize_subtest
 
 # clean up
@@ -50,7 +50,7 @@ $TS_CMD_UMOUNT $MOUNTPOINT
 ts_init_subtest "bind-shared"
 $TS_CMD_MOUNT --make-shared \
 	      --bind $MOUNTPOINT $MOUNTPOINT >> $TS_OUTPUT 2>&1
-$TS_CMD_FINDMNT -nr --target $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
+$TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
 $TS_CMD_UMOUNT $MOUNTPOINT
 ts_finalize_subtest
 
@@ -68,14 +68,14 @@ ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" $DEV
 ts_init_subtest "mount-private"
 $TS_CMD_MOUNT --make-private --make-unbindable \
 	      $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1
-$TS_CMD_FINDMNT -nr --target $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
+$TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
 $TS_CMD_UMOUNT $MOUNTPOINT
 ts_finalize_subtest
 
 ts_init_subtest "mount-private-ro"
 $TS_CMD_MOUNT $DEVICE $MOUNTPOINT -o ro,private >> $TS_OUTPUT 2>&1
-$TS_CMD_FINDMNT -nr --target $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
-$TS_CMD_FINDMNT -nr --target $MOUNTPOINT -o VFS-OPTIONS >> $TS_OUTPUT
+$TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
+$TS_CMD_FINDMNT -nr --mountpoint $MOUNTPOINT -o VFS-OPTIONS >> $TS_OUTPUT
 $TS_CMD_UMOUNT $MOUNTPOINT
 ts_finalize_subtest