diff options
| author | Karel Zak | 2014-03-05 13:19:19 +0100 |
|---|---|---|
| committer | Karel Zak | 2014-03-05 13:19:19 +0100 |
| commit | 65acdc8734535b7ad59363bfd4d54542c8451f23 (patch) | |
| tree | 900da7ef4206e4c7b83446d2183e62f198a6b5e4 /tests/ts/mount | |
| parent | hwclock: fix possible hang and other set_hardware_clock_exact() issues (diff) | |
| download | kernel-qcow2-util-linux-65acdc8734535b7ad59363bfd4d54542c8451f23.tar.gz kernel-qcow2-util-linux-65acdc8734535b7ad59363bfd4d54542c8451f23.tar.xz kernel-qcow2-util-linux-65acdc8734535b7ad59363bfd4d54542c8451f23.zip | |
build-sys: remove deprecated-mount/
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts/mount')
| -rwxr-xr-x | tests/ts/mount/shared-subtree | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/tests/ts/mount/shared-subtree b/tests/ts/mount/shared-subtree index c0716de2b..f234a289e 100755 --- a/tests/ts/mount/shared-subtree +++ b/tests/ts/mount/shared-subtree @@ -58,25 +58,19 @@ mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" $DEVICE -# multiple propagation flags for one mount(8) call is unsupported -# by old mount-deprecated/mount -$TS_CMD_MOUNT -V | grep -q libmount -if [ $? -eq 0 ]; then - - 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_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_UMOUNT $MOUNTPOINT - ts_finalize_subtest -fi +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_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_UMOUNT $MOUNTPOINT +ts_finalize_subtest ts_device_deinit $DEVICE rmdir $MOUNTPOINT |