diff options
author | Manuel Bentele | 2019-08-21 14:58:42 +0200 |
---|---|---|
committer | Manuel Bentele | 2019-08-21 14:58:42 +0200 |
commit | 0692b963aa3cb846d8abab5ef5247c4dbb3fec96 (patch) | |
tree | f13776d25da3e1adc1445aef22e7566ac98cbe84 /tests/ts/libmount | |
parent | losetup: added file format option to the man page (diff) | |
parent | partx: document -d vs. --nr and fix test (diff) | |
download | kernel-qcow2-util-linux-0692b963aa3cb846d8abab5ef5247c4dbb3fec96.tar.gz kernel-qcow2-util-linux-0692b963aa3cb846d8abab5ef5247c4dbb3fec96.tar.xz kernel-qcow2-util-linux-0692b963aa3cb846d8abab5ef5247c4dbb3fec96.zip |
lib/losetup: merge remote-tracking branch 'util-linux/master'kernel-qcow2
Signed-off-by: Manuel Bentele <development@manuel-bentele.de>
Diffstat (limited to 'tests/ts/libmount')
-rwxr-xr-x | tests/ts/libmount/context | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context index 3750c701f..6dd35b193 100755 --- a/tests/ts/libmount/context +++ b/tests/ts/libmount/context @@ -146,8 +146,8 @@ is_mounted $MOUNTPOINT && echo "$MOUNTPOINT still mounted" >> $TS_OUTPUT 2>&1 ts_finalize_subtest -# deprecated -ts_init_subtest "x-mount.mkdir" +# deprecated (x-* mount option maintained in userspace (e.g. utab) +ts_init_subtest "x-permanent" TS_NOEXIST="$TS_OUTDIR/${TS_TESTNAME}-${TS_SUBNAME}-noex" [ -d $TS_NOEXIST ] && rmdir $TS_NOEXIST @@ -159,7 +159,8 @@ $TS_CMD_UMOUNT $TS_NOEXIST rmdir $TS_NOEXIST -ts_init_subtest "X-mount.mkdir" +# X-* comment +ts_init_subtest "X-comment" TS_NOEXIST="$TS_OUTDIR/${TS_TESTNAME}-${TS_SUBNAME}-noex" [ -d $TS_NOEXIST ] && rmdir $TS_NOEXIST |