raid: don't skip prompt with force

Yes is meant to be used to skip all new prompts.
(--force just adds more prompts).

diff --git a/WHATS_NEW b/WHATS_NEW
index 2259976310600c6624a2047fad15b2a1bcfb35df..846983f9cc53038fa6ee88864e929497fc9e2b1c 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.108 -
 =================================
+  Require --yes to skip raid repair prompt.
   Change makefile %.d generation to handle filename changes without make clean.
   Fix use of buildir in make pofile.
   Enhance private volumes UUIDs with suffixed for easier detection.

diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 3e00e178bda82344f9a84f814079f7ee7614c244..d80fa6082bd616fbbd638335a3cbf3b39e9bef53 100644 (file)
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -1797,12 +1797,11 @@ static int _is_valid_raid_conversion(const struct segment_type *from_segtype,
        return 1;
 }
 
-static void _lvconvert_raid_repair_ask(struct cmd_context *cmd, int *replace_dev)
+static void _lvconvert_raid_repair_ask(struct cmd_context *cmd,
+                                      struct lvconvert_params *lp,
+                                      int *replace_dev)
 {
-       const char *dev_policy = NULL;
-
-       int force = arg_count(cmd, force_ARG);
-       int yes = arg_count(cmd, yes_ARG);
+       const char *dev_policy;
 
        *replace_dev = 1;
 
@@ -1818,15 +1817,8 @@ static void _lvconvert_raid_repair_ask(struct cmd_context *cmd, int *replace_dev
                return;
        }
 
-       if (force != PROMPT) {
-               *replace_dev = 0;
-               return;
-       }
-
-       if (yes)
-               return;
-
-       if (yes_no_prompt("Attempt to replace failed RAID images "
+       if (!lp->yes &&
+           yes_no_prompt("Attempt to replace failed RAID images "
                          "(requires full device resync)? [y/n]: ") == 'n') {
                *replace_dev = 0;
        }
@@ -1926,7 +1918,7 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l
                        init_mirror_in_sync(1);
                }
 
-               _lvconvert_raid_repair_ask(cmd, &replace);
+               _lvconvert_raid_repair_ask(cmd, lp, &replace);
 
                if (replace) {
                        if (!(failed_pvs = _failed_pv_list(lv->vg)))