summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlasdair G Kergon <agk@redhat.com>2014-04-04 02:22:40 +0100
committerAlasdair G Kergon <agk@redhat.com>2014-04-04 02:22:40 +0100
commitcc72f340d757af537f239689944c934bf9b8fd62 (patch)
treea7c3e5fc187c681c038b8f421625b1981c6acb63
parentb38a3d8c85a5ce96ccbac4e5be859d53a2ec4c35 (diff)
downloadlvm2-cc72f340d757af537f239689944c934bf9b8fd62.tar.gz
thin: Support thin_check --clear-needs-check-flag.
Update thin provisioning tools to version 0.3.2 or later!
-rw-r--r--WHATS_NEW2
-rw-r--r--configure.in12
-rw-r--r--lib/config/defaults.h11
3 files changed, 22 insertions, 3 deletions
diff --git a/WHATS_NEW b/WHATS_NEW
index b5e96fd30..dd3b42fc4 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,7 @@
Version 2.02.106 -
====================================
+ Add configure --disable-thin_check_needs_check to support old thin_check.
+ Use thin_check --clear-needs-check-flag by default.
Export lvm_even_rand() for controlled provision of random numbers.
Add lvmthin man page to section 7.
Extend internal validation of lv names size is less then 128 chars.
diff --git a/configure.in b/configure.in
index 88edb29db..d8cbe5cbd 100644
--- a/configure.in
+++ b/configure.in
@@ -476,6 +476,18 @@ AC_DEFINE_UNQUOTED([THIN_DUMP_CMD], ["$THIN_DUMP_CMD"],
AC_DEFINE_UNQUOTED([THIN_REPAIR_CMD], ["$THIN_REPAIR_CMD"],
[The path to 'thin_repair', if available.])
+dnl -- thin_check needs-check flag
+AC_MSG_CHECKING(whether thin_check supports the needs-check flag)
+AC_ARG_ENABLE(thin_check_needs_check,
+ AC_HELP_STRING([--disable-thin_check_needs_check],
+ [required if thin_check version is < 0.3.0]),
+ THIN_CHECK_NEEDS_CHECK=$enableval, THIN_CHECK_NEEDS_CHECK=yes)
+AC_MSG_RESULT($THIN_CHECK_NEEDS_CHECK)
+
+if test x$THIN_CHECK_NEEDS_CHECK = xyes; then
+ AC_DEFINE([THIN_CHECK_NEEDS_CHECK], 1, [Define to 1 if the external 'thin_check' tool requires the --clear-needs-check-flag option])
+fi
+
################################################################################
dnl -- cache inclusion type
AC_MSG_CHECKING(whether to include cache)
diff --git a/lib/config/defaults.h b/lib/config/defaults.h
index 94b11c0dc..2268e0bd4 100644
--- a/lib/config/defaults.h
+++ b/lib/config/defaults.h
@@ -67,12 +67,17 @@
#define DEFAULT_BACKGROUND_POLLING 1
#ifndef DMEVENTD_PATH
-#define DEFAULT_DMEVENTD_PATH ""
+# define DEFAULT_DMEVENTD_PATH ""
#else
-#define DEFAULT_DMEVENTD_PATH DMEVENTD_PATH
+# define DEFAULT_DMEVENTD_PATH DMEVENTD_PATH
+#endif
+
+#ifdef THIN_CHECK_NEEDS_CHECK
+# define DEFAULT_THIN_CHECK_OPTIONS "-q --clear-needs-check-flag"
+#else
+# define DEFAULT_THIN_CHECK_OPTIONS "-q"
#endif
-#define DEFAULT_THIN_CHECK_OPTIONS "-q"
#define DEFAULT_THIN_REPAIR_OPTIONS ""
#define DEFAULT_THIN_POOL_METADATA_REQUIRE_SEPARATE_PVS 0
#define DEFAULT_THIN_POOL_MAX_METADATA_SIZE (16 * 1024 * 1024) /* KB */