You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
48 lines
2.0 KiB
48 lines
2.0 KiB
4 years ago
|
conf/example.conf.in | 6 ++++++
|
||
|
|
lib/config/config_settings.h | 2 +-
|
||
|
|
lib/config/defaults.h | 1 +
|
||
|
|
3 files changed, 8 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/conf/example.conf.in b/conf/example.conf.in
|
||
|
|
index 6f7b161..9fa1235 100644
|
||
|
|
--- a/conf/example.conf.in
|
||
|
|
+++ b/conf/example.conf.in
|
||
|
|
@@ -326,6 +326,12 @@ devices {
|
||
|
|
# Enabling this setting allows the VG to be used as usual even with
|
||
|
|
# uncertain devices.
|
||
|
|
allow_changes_with_duplicate_pvs = 1
|
||
|
|
+
|
||
|
|
+ # Configuration option devices/allow_mixed_block_sizes.
|
||
|
|
+ # Allow PVs in the same VG with different logical block sizes.
|
||
|
|
+ # When allowed, the user is responsible to ensure that an LV is
|
||
|
|
+ # using PVs with matching block sizes when necessary.
|
||
|
|
+ allow_mixed_block_sizes = 1
|
||
|
|
}
|
||
|
|
|
||
|
|
# Configuration section allocation.
|
||
|
|
diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
|
||
|
|
index 622e982..055b883 100644
|
||
|
|
--- a/lib/config/config_settings.h
|
||
|
|
+++ b/lib/config/config_settings.h
|
||
|
|
@@ -470,7 +470,7 @@ cfg(devices_allow_changes_with_duplicate_pvs_CFG, "allow_changes_with_duplicate_
|
||
|
|
"Enabling this setting allows the VG to be used as usual even with\n"
|
||
|
|
"uncertain devices.\n")
|
||
|
|
|
||
|
|
-cfg(devices_allow_mixed_block_sizes_CFG, "allow_mixed_block_sizes", devices_CFG_SECTION, 0, CFG_TYPE_BOOL, 0, vsn(2, 3, 6), NULL, 0, NULL,
|
||
|
|
+cfg(devices_allow_mixed_block_sizes_CFG, "allow_mixed_block_sizes", devices_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_ALLOW_MIXED_BLOCK_SIZES, vsn(2, 2, 186), NULL, 0, NULL,
|
||
|
|
"Allow PVs in the same VG with different logical block sizes.\n"
|
||
|
|
"When allowed, the user is responsible to ensure that an LV is\n"
|
||
|
|
"using PVs with matching block sizes when necessary.\n")
|
||
|
|
diff --git a/lib/config/defaults.h b/lib/config/defaults.h
|
||
|
|
index 0d55928..e689208 100644
|
||
|
|
--- a/lib/config/defaults.h
|
||
|
|
+++ b/lib/config/defaults.h
|
||
|
|
@@ -46,6 +46,7 @@
|
||
|
|
#define DEFAULT_ISSUE_DISCARDS 0
|
||
|
|
#define DEFAULT_PV_MIN_SIZE_KB 2048
|
||
|
|
#define DEFAULT_ALLOW_CHANGES_WITH_DUPLICATE_PVS 1
|
||
|
|
+#define DEFAULT_ALLOW_MIXED_BLOCK_SIZES 1
|
||
|
|
|
||
|
|
#define DEFAULT_LOCKING_LIB "liblvm2clusterlock.so"
|
||
|
|
#define DEFAULT_ERROR_WHEN_FULL 0
|