Eryu Guan 5e6892dd8b common/rc: use findmnt to check mounted device ...

Doing 'grep -F "$dev on "' to find the mounted device is not
always accurate, e.g.

 SCRATCH_DEV=/vda6 is mounted but not on SCRATCH_MNT=/vda6/ovl-mnt - aborting
 Already mounted result:
 /dev/vda6 on /vda6 type xfs (rw,relatime,context=system_u:object_r:nfs_t:s0,attr2,inode64,noquota)

Fix it by using findmnt command and specifying the $dev as mount
source, print the result in "$dev $mnt" format. This works for local
filesystems, network filesystems and overlayfs, avoids all kinds of
tricky and error-prone grep pattern/regex.

Also fixed the if-then-fi format in _check_mounted_on() while we're
at it.

Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>

2017-03-10 16:53:41 +08:00

..

attr

common: add leading underscore to get_block_size

2017-01-15 13:56:45 +08:00

btrfs

check: prepare test report generator infrastructure

2017-03-07 19:53:12 +08:00

config

common/config: make SELinux protection conditional

2017-03-07 19:41:22 +08:00

defrag

common: add leading underscore to get_block_size

2017-01-15 13:56:45 +08:00

dmapi

xfstests: introduce a common directory

2013-03-26 21:44:05 -05:00

dmdelay

common: support dm-delay to introduce I/O delays

2016-07-01 23:12:49 +08:00

dmerror

common/dmerror: fix mount option issues

2016-08-05 10:32:10 +08:00

dmflakey

common: make sure dm device is all settled before removing it

2016-04-05 11:44:33 +10:00

dmhugedisk

xfs: map multiple bmbt records to a single rmapbt record

2016-06-15 15:44:49 +08:00

dmthin

common/dmthin: call $UDEV_SETTLE_PROG before 'dmsetup remove'

2017-01-18 17:29:46 +08:00

dump

xfstests: remove _need_to_be_root

2016-02-19 10:49:17 +11:00

encrypt

encrypt: add utilities for testing filesystem encryption

2016-12-24 16:47:12 +08:00

filestreams

common: use mount/umount helpers everywhere

2015-12-21 18:07:43 +11:00

filter

overlay: rename OVERLAY_LOWER/UPPER/WORK_DIR

2017-03-01 18:35:27 +08:00

filter.btrfs

btrfs/048: extend _filter_btrfs_prop_error to handle additional errors

2016-07-01 11:17:08 +08:00

fuzzy

common/fuzzy: discard xfs_io stdout in _scratch_fuzz_modify

2017-02-10 14:53:57 +08:00

inject

xfs: inject errors at various parts of the deferred op completion

2016-07-07 12:24:13 +08:00

log

common/log: add ext4 support for log state probing

2017-02-06 14:15:08 +08:00

Makefile

xfstests: make install support common/ and tests/ dirs

2013-04-12 13:17:46 -05:00

populate

common/populate: create attrs in different namespaces

2017-01-27 16:06:12 +08:00

punch

common: add leading underscore to get_block_size

2017-01-15 13:56:45 +08:00

quota

reflink: fix quota tests to work properly

2017-01-15 13:56:45 +08:00

rc

common/rc: use findmnt to check mounted device

2017-03-10 16:53:41 +08:00

reflink

ocfs2: test reflinking to inline data files

2017-01-15 13:56:45 +08:00

renameat2

common: add infrastructure for renameat2 syscall tests

2014-04-14 10:34:51 +10:00

repair

xfs: filter stripe width details from repair

2016-06-15 15:32:18 +08:00

report

report: Add xunit format report generator

2017-03-07 19:53:31 +08:00

scsi_debug

block: test fallocate for block devices

2016-05-09 10:49:50 +10:00

xfs

check: prepare test report generator infrastructure

2017-03-07 19:53:12 +08:00