diff options
| author | Milan Broz | 2012-10-05 18:37:40 +0200 |
|---|---|---|
| committer | Karel Zak | 2012-10-09 12:12:49 +0200 |
| commit | 5eec85708da68e9d2d32f51db6db30f2c0ffb438 (patch) | |
| tree | 7270d790af8db104f55c2228c9dfec99eab81092 /tests/ts/mount | |
| parent | tests: ignore test if kernel doesn't support minix fs (diff) | |
| download | kernel-qcow2-util-linux-5eec85708da68e9d2d32f51db6db30f2c0ffb438.tar.gz kernel-qcow2-util-linux-5eec85708da68e9d2d32f51db6db30f2c0ffb438.tar.xz kernel-qcow2-util-linux-5eec85708da68e9d2d32f51db6db30f2c0ffb438.zip | |
tests: fix mount move test to work with shared mount
If parent mount for test directory is mounted with shared flag,
move mount test fails because kernel rejects mount move operation.
Use another directory level and explicitly make parent mount private.
(All "modern" systems using system have mounts shared for some reason.)
Signed-off-by: Milan Broz <mbroz@redhat.com>
Diffstat (limited to 'tests/ts/mount')
| -rwxr-xr-x | tests/ts/mount/move | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/tests/ts/mount/move b/tests/ts/mount/move index 3862f462c..ea376856a 100755 --- a/tests/ts/mount/move +++ b/tests/ts/mount/move @@ -22,9 +22,19 @@ TS_DESC="move" ts_init "$*" ts_skip_nonroot -DIR_SRC="$TS_OUTDIR/mnt-move-src" -DIR_A="$TS_OUTDIR/mnt-move-A" -DIR_B="$TS_OUTDIR/mnt-move-B" +DIR_PRIVATE2="$TS_OUTDIR/mnt-move-private2" +DIR_PRIVATE="$TS_OUTDIR/mnt-move-private" + +DIR_SRC="$DIR_PRIVATE/mnt-move-src" +DIR_A="$DIR_PRIVATE/mnt-move-A" +DIR_B="$DIR_PRIVATE/mnt-move-B" + +# create bind mount and make it private to be sure +# (kernel cannot move mount with shared parent) +[ -d $DIR_PRIVATE2 ] || mkdir $DIR_PRIVATE2 +[ -d $DIR_PRIVATE ] || mkdir $DIR_PRIVATE +$TS_CMD_MOUNT --bind $DIR_PRIVATE2 $DIR_PRIVATE +$TS_CMD_MOUNT --make-private $DIR_PRIVATE [ -d $DIR_SRC ] || mkdir $DIR_SRC [ -d $DIR_A ] || mkdir $DIR_A @@ -48,6 +58,9 @@ $TS_CMD_FINDMNT --kernel --target "$DIR_B" &> /dev/null $TS_CMD_UMOUNT $DIR_B rmdir $DIR_SRC $DIR_A $DIR_B +$TS_CMD_UMOUNT $DIR_PRIVATE +rmdir $DIR_PRIVATE $DIR_PRIVATE2 + ts_log "Success" ts_finalize |