From b995f06abfcd03cb4d7a3c7ebc01bd416abdc0a8 Mon Sep 17 00:00:00 2001 From: Peter Rajnoha Date: Wed, 12 Mar 2014 15:17:52 +0100 Subject: [PATCH] config: mark global/thin_disabled_features as having no default value The global/thin_disabled_features should be marked as having no default value. Otherwise the output from 'lvm dumpconfig --type default' would have 'thin_disabled_features=""' which will produce an error message 'Ignoring empty string in config file ...' if such output is feed back to lvm. --- lib/config/config_settings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h index e631de621..e2a5c0c9d 100644 --- a/lib/config/config_settings.h +++ b/lib/config/config_settings.h @@ -176,7 +176,7 @@ cfg(global_lvdisplay_shows_full_device_path_CFG, "lvdisplay_shows_full_device_pa cfg(global_use_lvmetad_CFG, "use_lvmetad", global_CFG_SECTION, 0, CFG_TYPE_BOOL, 0, vsn(2, 2, 93), NULL) cfg(global_thin_check_executable_CFG, "thin_check_executable", global_CFG_SECTION, CFG_ALLOW_EMPTY, CFG_TYPE_STRING, THIN_CHECK_CMD, vsn(2, 2, 94), NULL) cfg_array(global_thin_check_options_CFG, "thin_check_options", global_CFG_SECTION, 0, CFG_TYPE_STRING, "#S" DEFAULT_THIN_CHECK_OPTIONS, vsn(2, 2, 96), NULL) -cfg_array(global_thin_disabled_features_CFG, "thin_disabled_features", global_CFG_SECTION, 0, CFG_TYPE_STRING, "#S", vsn(2, 2, 99), NULL) +cfg_array(global_thin_disabled_features_CFG, "thin_disabled_features", global_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, "#S", vsn(2, 2, 99), NULL) cfg(global_thin_dump_executable_CFG, "thin_dump_executable", global_CFG_SECTION, CFG_ALLOW_EMPTY, CFG_TYPE_STRING, THIN_DUMP_CMD, vsn(2, 2, 100), NULL) cfg(global_thin_repair_executable_CFG, "thin_repair_executable", global_CFG_SECTION, CFG_ALLOW_EMPTY, CFG_TYPE_STRING, THIN_REPAIR_CMD, vsn(2, 2, 100), NULL) cfg_array(global_thin_repair_options_CFG, "thin_repair_options", global_CFG_SECTION, 0, CFG_TYPE_STRING, "#S" DEFAULT_THIN_REPAIR_OPTIONS, vsn(2, 2, 100), NULL)