summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlasdair G Kergon <agk@redhat.com>2017-08-11 20:28:53 +0100
committerAlasdair G Kergon <agk@redhat.com>2017-08-11 20:28:53 +0100
commit7d09d7288b3aaecdfba9a3a05e7697f7dcdfed79 (patch)
tree3d34dd653419647fa5769e4dff3f79ab9a292d37
parent955083e625eb003090ce8f699e8d414a215cce1f (diff)
downloadlvm2-7d09d7288b3aaecdfba9a3a05e7697f7dcdfed79.tar.gz
pvcreate: Disallow --bootloaderareasize with --restorefile.
The backup file already holds the bootloader area details to use so don't overcomplicate things.
-rw-r--r--WHATS_NEW1
-rw-r--r--tools/command-lines.in2
2 files changed, 3 insertions, 0 deletions
diff --git a/WHATS_NEW b/WHATS_NEW
index c4845299e..b21702ce0 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.174 -
=================================
+ Disallow --bootloaderareasize with pvcreate --restorefile.
Fix lvmlockd check for running lock managers during lock adoption.
Add --withgeneralpreamble and --withlocalpreamble to lvmconfig.
Improve makefiles' linking.
diff --git a/tools/command-lines.in b/tools/command-lines.in
index 1ef234e1a..2f4e48f82 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -1367,6 +1367,8 @@ OO: --dataalignment SizeKB, --dataalignmentoffset SizeKB, --bootloaderareasize S
--metadataignore Bool, --norestorefile, --setphysicalvolumesize SizeMB,
--reportformat ReportFmt, --restorefile String, --uuidstr String, --zero Bool
ID: pvcreate_general
+RULE: --norestorefile not --restorefile
+RULE: --bootloaderareasize not --restorefile
---