shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-08-03 08:22:00 +03:00
Code Releases Activity

config: add CFG_DEFAULT_COMMENTED to comment out default value on output

Browse Source
This commit is contained in:
Peter Rajnoha
2015-04-30 18:26:56 +02:00
parent 8f25606d3a
commit 11e0dc40dc
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/config/config.c
View File

@ -1664,7 +1664,7 @@ static int _out_line_fn(const struct dm_config_node *cn, const char *line, void
/* Usual tree view with nodes and their values. */ /* Usual tree view with nodes and their values. */
if ((out->tree_spec->type != CFG_DEF_TREE_CURRENT) && if ((out->tree_spec->type != CFG_DEF_TREE_CURRENT) &&
(out->tree_spec->type != CFG_DEF_TREE_DIFF) && (out->tree_spec->type != CFG_DEF_TREE_DIFF) &&
(cfg_def->flags & CFG_DEFAULT_UNDEFINED)) { (cfg_def->flags & (CFG_DEFAULT_UNDEFINED | CFG_DEFAULT_COMMENTED))) {
space_prefix = ((len = strspn(line, "\t "))) ? dm_pool_strndup(out->mem, line, len) : NULL; space_prefix = ((len = strspn(line, "\t "))) ? dm_pool_strndup(out->mem, line, len) : NULL;
fprintf(out->fp, "%s%s%s\n", space_prefix ? : "", "# ", line + len); fprintf(out->fp, "%s%s%s\n", space_prefix ? : "", "# ", line + len);
if (space_prefix) if (space_prefix)

6
lib/config/config.h
View File

@ -113,10 +113,12 @@ typedef union {
#define CFG_PROFILABLE_METADATA 0x030 #define CFG_PROFILABLE_METADATA 0x030
/* whether the default value is undefned */ /* whether the default value is undefned */
#define CFG_DEFAULT_UNDEFINED 0x040 #define CFG_DEFAULT_UNDEFINED 0x040
/* whether the default value is commented out on output */
#define CFG_DEFAULT_COMMENTED 0x080
/* whether the default value is calculated during run time */ /* whether the default value is calculated during run time */
#define CFG_DEFAULT_RUN_TIME 0x080 #define CFG_DEFAULT_RUN_TIME 0x100
/* whether the configuration setting is disabled (and hence defaults always used) */ /* whether the configuration setting is disabled (and hence defaults always used) */
#define CFG_DISABLED 0x100 #define CFG_DISABLED 0x200
/* configuration definition item structure */ /* configuration definition item structure */
typedef struct cfg_def_item { typedef struct cfg_def_item {

1
lib/config/config_settings.h
View File

@ -48,6 +48,7 @@
* CFG_PROFILABLE - this node is customizable by a profile * CFG_PROFILABLE - this node is customizable by a profile
* CFG_PROFILABLE_METADATA - profilable and attachable to VG/LV metadata * CFG_PROFILABLE_METADATA - profilable and attachable to VG/LV metadata
* CFG_DEFAULT_UNDEFINED - node's default value is undefined * CFG_DEFAULT_UNDEFINED - node's default value is undefined
* CFG_DEFAULT_COMMENTED - node's default value is commented out on output
* CFG_DISABLED - configuration is disabled (defaults always used) * CFG_DISABLED - configuration is disabled (defaults always used)
* *
* type: Allowed type for the value of simple configuation setting, one of: * type: Allowed type for the value of simple configuation setting, one of: