summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorOndrej Oprala2012-12-21 14:45:46 +0100
committerKarel Zak2013-01-09 18:52:32 +0100
commit701c69617e50ed8c15bc2c5bc7bf6eee1cb04b23 (patch)
treed979ddb7a6757d3ab5f2900d460ab721f7025a8e /tests
parentlibmount; add recursive mkdir (diff)
downloadkernel-qcow2-util-linux-701c69617e50ed8c15bc2c5bc7bf6eee1cb04b23.tar.gz
kernel-qcow2-util-linux-701c69617e50ed8c15bc2c5bc7bf6eee1cb04b23.tar.xz
kernel-qcow2-util-linux-701c69617e50ed8c15bc2c5bc7bf6eee1cb04b23.zip
mount: add support for x-mount.mkdir[=<mode>] option
If the target directory (mountpoint) does not exist then mount(8) will create it before mount.<type> is executed or mount(2) syscall is called. Co-Author: Karel Zak <kzak@redhat.com> Signed-off-by: Ondrej Oprala <ooprala@redhat.com> Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/expected/libmount/context-x-mount.mkdir1
-rwxr-xr-xtests/ts/libmount/context10
2 files changed, 11 insertions, 0 deletions
diff --git a/tests/expected/libmount/context-x-mount.mkdir b/tests/expected/libmount/context-x-mount.mkdir
new file mode 100644
index 000000000..7504a7e83
--- /dev/null
+++ b/tests/expected/libmount/context-x-mount.mkdir
@@ -0,0 +1 @@
+successfully mounted
diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context
index c8f2850a8..c3b0b6dea 100755
--- a/tests/ts/libmount/context
+++ b/tests/ts/libmount/context
@@ -13,6 +13,8 @@ TESTPROG="$TS_HELPER_LIBMOUNT_CONTEXT"
LABEL=libmount-test
UUID=$(uuidgen)
MOUNTPOINT="$TS_MOUNTPOINT"
+TS_NOEXIST="$TS_OUTDIR/${TS_TESTNAME}-${TS_SUBNAME}-noex"
+[ -d $TS_NOEXIST ] && rmdir $TS_NOEXIST
#set -x
@@ -128,6 +130,14 @@ grep -q $MOUNTPOINT $LIBMOUNT_MTAB &&
echo "umount failed: found $MOUNTPOINT in $LIBMOUNT_MTAB" >> $TS_OUTPUT 2>&1
ts_finalize_subtest
+ts_init_subtest "x-mount.mkdir"
+$TS_CMD_MOUNT -o x-mount.mkdir --bind $MOUNTPOINT $TS_NOEXIST >> $TS_OUTPUT 2>&1 &&
+ echo "successfully mounted" >> $TS_OUTPUT
+ts_finalize_subtest
+
+$TS_CMD_UMOUNT $TS_NOEXIST
+rmdir $TS_NOEXIST
+
ts_log "...done."
rmmod scsi_debug
ts_finalize