common/rc: Use -v option with findmnt

Since btrfs puts in the subvol name in the device, we should
use -v option to not print the bind mounts or btrfs volumes.

Otherwise if a new subvolume is set as the default volume to be
mounted, as what btrfs/009 does, then next _require_scratch fails

  SCRATCH_DEV=/dev/vdc is mounted but not on SCRATCH_MNT=/scratch - aborting
  Already mounted result:
  /dev/vdc[/newvol] /scratch

[eguan: update commit log a bit, add failure example]

Fixes: 5e6892d ("common/rc: use findmnt to check mounted device")
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>

diff --git a/common/rc b/common/rc
index d53f67967829631d7b758bbc173b2a87d4cce29d..d7a53215bd2718bee03544362f68d000999ca799 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -1463,7 +1463,7 @@ _check_mounted_on()
        local type=$5
 
        # find $dev as the source, and print result in "$dev $mnt" format
-       local mount_rec=`findmnt -rnc -S $dev -o SOURCE,TARGET`
+       local mount_rec=`findmnt -rncv -S $dev -o SOURCE,TARGET`
        [ -n "$mount_rec" ] || return 1 # 1 = not mounted
 
        # if it's mounted, make sure its on $mnt