summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlasdair G Kergon <agk@redhat.com>2015-12-03 17:40:10 +0000
committerAlasdair G Kergon <agk@redhat.com>2015-12-03 17:40:10 +0000
commitc24d913c47d9639df277b613cee9b5a57aca0762 (patch)
treec5093c16bf3e7275f729b92c6d86e0a47b182402
parent89418c1253db901eb6f22b342bc5d98d63aa32e5 (diff)
downloadlvm2-c24d913c47d9639df277b613cee9b5a57aca0762.tar.gz
lvconvert: Reinstate raid merge after splitmirror.
After commit 46c8d6bb8ae91ee67c8633496cc6c3d92bb4f3ce (lvconvert: Improve message for raid without -m)
-rw-r--r--tools/lvconvert.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 82b804f5c..d480f6ac9 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -1734,7 +1734,7 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l
return 0;
}
- if (seg_is_linear(seg) && !arg_count(cmd, mirrors_ARG)) {
+ if (seg_is_linear(seg) && !lp->merge_mirror && !arg_count(cmd, mirrors_ARG)) {
log_error("Raid conversions require -m/--mirrors");
return 0;
}