mirror of
git://sourceware.org/git/lvm2.git
synced 2025-02-25 21:57:45 +03:00
Remove assumption that --yes must be used only in --force mode
This is not only undocumented but is is also in violation with --help documentation. Using --yes without --force is useful in pvcreate when it detects old signature.
This commit is contained in:
parent
f05cf23b89
commit
24c1a0954b
@ -1,6 +1,7 @@
|
|||||||
Version 2.02.74 -
|
Version 2.02.74 -
|
||||||
==================================
|
==================================
|
||||||
Simplify MD/swap signature detection in pvcreate and allow aborting.
|
Simplify MD/swap signature detection in pvcreate and allow aborting.
|
||||||
|
Remove assumption that --yes must be used only in --force mode.
|
||||||
|
|
||||||
Version 2.02.73 - 18th August 2010
|
Version 2.02.73 - 18th August 2010
|
||||||
==================================
|
==================================
|
||||||
|
@ -143,11 +143,6 @@ int pvremove(struct cmd_context *cmd, int argc, char **argv)
|
|||||||
return EINVALID_CMD_LINE;
|
return EINVALID_CMD_LINE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (arg_count(cmd, yes_ARG) && !arg_count(cmd, force_ARG)) {
|
|
||||||
log_error("Option y can only be given with option f");
|
|
||||||
return EINVALID_CMD_LINE;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i < argc; i++) {
|
for (i = 0; i < argc; i++) {
|
||||||
r = pvremove_single(cmd, argv[i], NULL);
|
r = pvremove_single(cmd, argv[i], NULL);
|
||||||
if (r > ret)
|
if (r > ret)
|
||||||
|
@ -1344,11 +1344,6 @@ int pvcreate_params_validate(struct cmd_context *cmd,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (arg_count(cmd, yes_ARG) && !arg_count(cmd, force_ARG)) {
|
|
||||||
log_error("Option y can only be given with option f");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
pp->yes = arg_count(cmd, yes_ARG);
|
pp->yes = arg_count(cmd, yes_ARG);
|
||||||
pp->force = arg_count(cmd, force_ARG);
|
pp->force = arg_count(cmd, force_ARG);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user