|
 |
343f27 |
From 6dd02d6c30d69b790b11efd10e3d20c51e1625fd Mon Sep 17 00:00:00 2001
|
|
|
343f27 |
From: Giuseppe Scrivano <gscrivan@redhat.com>
|
|
|
343f27 |
Date: Mon, 10 Feb 2014 19:11:51 +0100
|
|
|
343f27 |
Subject: [PATCH] doc: reintroduce --force in man pages
|
|
|
343f27 |
|
|
|
343f27 |
--force was also used to disable some checks, not only by --prompt,
|
|
|
343f27 |
add this to the man pages.
|
|
|
343f27 |
|
|
|
343f27 |
Suppress --force from the --help output as the description is not
|
|
|
343f27 |
correct.
|
|
|
343f27 |
|
|
|
343f27 |
RHEL-only
|
|
|
343f27 |
|
|
|
343f27 |
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1060571
|
|
|
343f27 |
|
|
|
343f27 |
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
|
|
|
343f27 |
---
|
|
|
343f27 |
man/virt-clone.pod | 4 ++++
|
|
|
343f27 |
man/virt-install.pod | 5 +++++
|
|
|
343f27 |
virt-clone | 3 +--
|
|
|
343f27 |
virt-install | 3 +--
|
|
|
343f27 |
4 files changed, 11 insertions(+), 4 deletions(-)
|
|
|
343f27 |
|
|
|
343f27 |
diff --git a/man/virt-clone.pod b/man/virt-clone.pod
|
|
|
343f27 |
index cf770c4..b15f9f5 100644
|
|
|
343f27 |
--- a/man/virt-clone.pod
|
|
|
343f27 |
+++ b/man/virt-clone.pod
|
|
|
343f27 |
@@ -147,6 +147,10 @@ Print debugging information to the terminal when running the install process.
|
|
|
343f27 |
The debugging information is also stored in C<$HOME/.virtinst/virt-clone.log>
|
|
|
343f27 |
even if this parameter is omitted.
|
|
|
343f27 |
|
|
|
343f27 |
+=item --force
|
|
|
343f27 |
+
|
|
|
343f27 |
+Override certain error conditions, such as when an image file already exists.
|
|
|
343f27 |
+
|
|
|
343f27 |
=back
|
|
|
343f27 |
|
|
|
343f27 |
=head1 EXAMPLES
|
|
|
343f27 |
diff --git a/man/virt-install.pod b/man/virt-install.pod
|
|
|
343f27 |
index ae1cea8..2fcfdcb 100644
|
|
|
343f27 |
--- a/man/virt-install.pod
|
|
|
343f27 |
+++ b/man/virt-install.pod
|
|
|
343f27 |
@@ -1292,6 +1292,11 @@ value will make virt-install wait indefinitely, a value of 0 triggers the
|
|
|
343f27 |
same results as noautoconsole. If the time limit is exceeded, virt-install
|
|
|
343f27 |
simply exits, leaving the virtual machine in its current state.
|
|
|
343f27 |
|
|
|
343f27 |
+
|
|
|
343f27 |
+=item --force
|
|
|
343f27 |
+
|
|
|
343f27 |
+Override certain error conditions, such as when an image file already exists.
|
|
|
343f27 |
+
|
|
|
343f27 |
=item --dry-run
|
|
|
343f27 |
|
|
|
343f27 |
Proceed through the guest creation process, but do NOT create storage devices,
|
|
|
343f27 |
diff --git a/virt-clone b/virt-clone
|
|
|
343f27 |
index 419f692..857e6fc 100755
|
|
|
343f27 |
--- a/virt-clone
|
|
|
343f27 |
+++ b/virt-clone
|
|
|
343f27 |
@@ -190,8 +190,7 @@ def parse_args():
|
|
|
343f27 |
help=optparse.SUPPRESS_HELP)
|
|
|
343f27 |
misc.add_option("", "--force", action="store_true", dest="force",
|
|
|
343f27 |
default=False,
|
|
|
343f27 |
- help=_("Do not prompt for input. Answers yes where "
|
|
|
343f27 |
- "applicable, terminates for all other prompts"))
|
|
|
343f27 |
+ help=optparse.SUPPRESS_HELP)
|
|
|
343f27 |
misc.add_option("-q", "--quiet", action="store_true", dest="quiet",
|
|
|
343f27 |
help=_("Suppress non-error output"))
|
|
|
343f27 |
misc.add_option("", "--clone-running", action="store_true",
|
|
|
343f27 |
diff --git a/virt-install b/virt-install
|
|
|
343f27 |
index 2ee114d..c6a88fe 100755
|
|
|
343f27 |
--- a/virt-install
|
|
|
343f27 |
+++ b/virt-install
|
|
|
343f27 |
@@ -990,8 +990,7 @@ def parse_args():
|
|
|
343f27 |
help=_("Run through install process, but do not "
|
|
|
343f27 |
"create devices or define the guest."))
|
|
|
343f27 |
misc.add_option("", "--force", action="store_true", dest="force",
|
|
|
343f27 |
- help=_("Forces 'yes' for any applicable prompts, "
|
|
|
343f27 |
- "terminates for all others"))
|
|
|
343f27 |
+ help=optparse.SUPPRESS_HELP)
|
|
|
343f27 |
misc.add_option("-q", "--quiet", action="store_true", dest="quiet",
|
|
|
343f27 |
help=_("Suppress non-error output"))
|
|
|
343f27 |
misc.add_option("", "--prompt", action="store_true", dest="prompt",
|
|
|
343f27 |
--
|
|
|
343f27 |
1.8.5.3
|
|
|
343f27 |
|