From 6dd02d6c30d69b790b11efd10e3d20c51e1625fd Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Mon, 10 Feb 2014 19:11:51 +0100
Subject: [PATCH] doc: reintroduce --force in man pages

--force was also used to disable some checks, not only by --prompt,
add this to the man pages.

Suppress --force from the --help output as the description is not
correct.

RHEL-only

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1060571

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
 man/virt-clone.pod   | 4 ++++
 man/virt-install.pod | 5 +++++
 virt-clone           | 3 +--
 virt-install         | 3 +--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/man/virt-clone.pod b/man/virt-clone.pod
index cf770c4..b15f9f5 100644
--- a/man/virt-clone.pod
+++ b/man/virt-clone.pod
@@ -147,6 +147,10 @@ Print debugging information to the terminal when running the install process.
 The debugging information is also stored in C<$HOME/.virtinst/virt-clone.log>
 even if this parameter is omitted.
 
+=item --force
+
+Override certain error conditions, such as when an image file already exists.
+
 =back
 
 =head1 EXAMPLES
diff --git a/man/virt-install.pod b/man/virt-install.pod
index ae1cea8..2fcfdcb 100644
--- a/man/virt-install.pod
+++ b/man/virt-install.pod
@@ -1292,6 +1292,11 @@ value will make virt-install wait indefinitely, a value of 0 triggers the
 same results as noautoconsole. If the time limit is exceeded, virt-install
 simply exits, leaving the virtual machine in its current state.
 
+
+=item --force
+
+Override certain error conditions, such as when an image file already exists.
+
 =item --dry-run
 
 Proceed through the guest creation process, but do NOT create storage devices,
diff --git a/virt-clone b/virt-clone
index 419f692..857e6fc 100755
--- a/virt-clone
+++ b/virt-clone
@@ -190,8 +190,7 @@ def parse_args():
                     help=optparse.SUPPRESS_HELP)
     misc.add_option("", "--force", action="store_true", dest="force",
                     default=False,
-                    help=_("Do not prompt for input. Answers yes where "
-                           "applicable, terminates for all other prompts"))
+                    help=optparse.SUPPRESS_HELP)
     misc.add_option("-q", "--quiet", action="store_true", dest="quiet",
                     help=_("Suppress non-error output"))
     misc.add_option("", "--clone-running", action="store_true",
diff --git a/virt-install b/virt-install
index 2ee114d..c6a88fe 100755
--- a/virt-install
+++ b/virt-install
@@ -990,8 +990,7 @@ def parse_args():
                     help=_("Run through install process, but do not "
                            "create devices or define the guest."))
     misc.add_option("", "--force", action="store_true", dest="force",
-                    help=_("Forces 'yes' for any applicable prompts, "
-                           "terminates for all others"))
+                    help=optparse.SUPPRESS_HELP)
     misc.add_option("-q", "--quiet", action="store_true", dest="quiet",
                     help=_("Suppress non-error output"))
     misc.add_option("", "--prompt", action="store_true", dest="prompt",
-- 
1.8.5.3