diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/commands/toolcontext.c | 12 | ||||
| -rw-r--r-- | lib/display/display.c | 9 | ||||
| -rw-r--r-- | lib/metadata/lv_manip.c | 1 |
3 files changed, 18 insertions, 4 deletions
diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index 57667b64..42306241 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -144,8 +144,12 @@ static void _init_logging(struct cmd_context *cmd) find_config_tree_int(cmd, "log/level", DEFAULT_LOGLEVEL); init_debug(cmd->default_settings.debug); - /* Suppress all non-essential stdout? */ - cmd->default_settings.silent = + /* + * Suppress all non-essential stdout? + * -qq can override the default of 0 to 1 later. + * Once set to 1, there is no facility to change it back to 0. + */ + cmd->default_settings.silent = silent_mode() ? : find_config_tree_int(cmd, "log/silent", DEFAULT_SILENT); init_silent(cmd->default_settings.silent); @@ -1296,7 +1300,9 @@ struct cmd_context *create_toolcontext(unsigned is_long_lived, goto out; } /* Buffers are used for lines without '\n' */ - } + } else + /* Without buffering, must not use stdin/stdout */ + init_silent(1); /* * Environment variable LVM_SYSTEM_DIR overrides this below. diff --git a/lib/display/display.c b/lib/display/display.c index 2422b51e..b15ff71c 100644 --- a/lib/display/display.c +++ b/lib/display/display.c @@ -902,11 +902,19 @@ void display_segtypes(const struct cmd_context *cmd) } } +/* + * Prompt for y or n from stdin. + * Defaults to 'no' in silent mode. + * All callers should support --yes and/or --force to override this. + */ char yes_no_prompt(const char *prompt, ...) { int c = 0, ret = 0; va_list ap; + if (silent_mode()) + return 'n'; + sigint_allow(); do { if (c == '\n' || !c) { @@ -939,4 +947,3 @@ char yes_no_prompt(const char *prompt, ...) return ret; } - diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index d591b7b5..617d4b71 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -2741,6 +2741,7 @@ int lv_extend(struct logical_volume *lv, log_error("%s/%s is not active." " Unable to get sync percent.", lv->vg->name, lv->name); + /* FIXME Support --force */ if (yes_no_prompt("Do full resync of extended " "portion of %s/%s? [y/n]: ", lv->vg->name, lv->name) == 'y') |