diff options
author | Karel Zak | 2016-04-15 11:29:22 +0200 |
---|---|---|
committer | Karel Zak | 2016-04-15 11:29:22 +0200 |
commit | 3904d876368f049fc2cf8ffcb6db9e7493e9cfe5 (patch) | |
tree | e5e94cb32eb21f41dc12baa359a08b6b7cab3f37 | |
parent | umount: add note about FS names differences to the man page (diff) | |
download | kernel-qcow2-util-linux-3904d876368f049fc2cf8ffcb6db9e7493e9cfe5.tar.gz kernel-qcow2-util-linux-3904d876368f049fc2cf8ffcb6db9e7493e9cfe5.tar.xz kernel-qcow2-util-linux-3904d876368f049fc2cf8ffcb6db9e7493e9cfe5.zip |
tests: remove USE_LIBMOUNT_FORCE_MOUNTINFO
Signed-off-by: Karel Zak <kzak@redhat.com>
-rw-r--r-- | libmount/src/version.c | 4 | ||||
-rwxr-xr-x | tests/ts/libmount/context | 5 | ||||
-rwxr-xr-x | tests/ts/libmount/context-py | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/libmount/src/version.c b/libmount/src/version.c index 2d30954bb..76e137f32 100644 --- a/libmount/src/version.c +++ b/libmount/src/version.c @@ -28,8 +28,8 @@ static const char *lib_features[] = { #ifdef HAVE_BTRFS_SUPPORT "btrfs", #endif -#ifdef USE_LIBMOUNT_FORCE_MOUNTINFO - "force-mountinfo", +#ifdef USE_LIBMOUNT_SUPPORT_MTAB + "mtab", #endif #if !defined(NDEBUG) "assert", /* libc assert.h stuff */ diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context index d0d1c3d5f..2566ccb53 100755 --- a/tests/ts/libmount/context +++ b/tests/ts/libmount/context @@ -35,9 +35,10 @@ $TS_CMD_UMOUNT $MOUNTPOINT &> /dev/null ts_scsi_debug_init dev_size_mb=100 DEVNAME=$(basename $TS_DEVICE) -grep -q '#define USE_LIBMOUNT_FORCE_MOUNTINFO' ${top_builddir}/config.h +MOUNTINFO_ONLY=yes +grep -q '#define USE_LIBMOUNT_SUPPORT_MTAB' ${top_builddir}/config.h if [ $? == 0 ]; then - MOUNTINFO_ONLY=yes + MOUNTINFO_ONLY=no fi ts_log "Create partitions" diff --git a/tests/ts/libmount/context-py b/tests/ts/libmount/context-py index c8b7b4eff..5188309be 100755 --- a/tests/ts/libmount/context-py +++ b/tests/ts/libmount/context-py @@ -37,9 +37,10 @@ $TS_CMD_UMOUNT $MOUNTPOINT &> /dev/null ts_scsi_debug_init dev_size_mb=100 DEVNAME=$(basename $TS_DEVICE) -grep -q '#define USE_LIBMOUNT_FORCE_MOUNTINFO' ${top_builddir}/config.h +MOUNTINFO_ONLY=yes +grep -q '#define USE_LIBMOUNT_SUPPORT_MTAB' ${top_builddir}/config.h if [ $? == 0 ]; then - MOUNTINFO_ONLY=yes + MOUNTINFO_ONLY=no fi ts_log "Create partitions" |