diff options
| author | David Teigland <teigland@redhat.com> | 2016-07-20 10:44:28 -0500 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2016-07-20 10:44:28 -0500 |
| commit | b203d5e745ae779c5686868f1b4c461916ef73b9 (patch) | |
| tree | 693c88bf8883aff1ede0c6452435d37d2b015377 | |
| parent | 6ea250e2d05aeb55c883aafa0a98e97660dfd633 (diff) | |
| download | lvm2-b203d5e745ae779c5686868f1b4c461916ef73b9.tar.gz | |
lvconvert: allow implied cache pool convert
Just as with the implied thin pool convert when
given ambiguous command line options.
| -rw-r--r-- | tools/lvconvert.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 2e84348a9..2fd6094ba 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -4201,7 +4201,9 @@ static int _convert_raid(struct cmd_context *cmd, struct logical_volume *lv, if ((new_type && !strcmp(new_type, SEG_TYPE_NAME_THIN_POOL)) || arg_is_set(cmd, thinpool_ARG)) return _convert_raid_thin_pool(cmd, lv, lp); - if (new_type && !strcmp(new_type, SEG_TYPE_NAME_CACHE_POOL)) + /* Using --cachepool is ambiguous and not preferred. */ + + if ((new_type && !strcmp(new_type, SEG_TYPE_NAME_CACHE_POOL)) || arg_is_set(cmd, cachepool_ARG)) return _convert_raid_cache_pool(cmd, lv, lp); if (new_type && new_segtype && segtype_is_raid(new_segtype)) @@ -4261,7 +4263,9 @@ static int _convert_striped(struct cmd_context *cmd, struct logical_volume *lv, if ((new_type && !strcmp(new_type, SEG_TYPE_NAME_THIN_POOL)) || arg_is_set(cmd, thinpool_ARG)) return _convert_striped_thin_pool(cmd, lv, lp); - if (new_type && !strcmp(new_type, SEG_TYPE_NAME_CACHE_POOL)) + /* Using --cachepool is ambiguous and not preferred. */ + + if ((new_type && !strcmp(new_type, SEG_TYPE_NAME_CACHE_POOL)) || arg_is_set(cmd, cachepool_ARG)) return _convert_striped_cache_pool(cmd, lv, lp); if (new_type && !strcmp(new_type, SEG_TYPE_NAME_MIRROR)) |