|
 |
151578 |
From b8e5d0c7c03f7b96d6a60c505d227d9de3ba582d Mon Sep 17 00:00:00 2001
|
|
|
151578 |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
151578 |
Date: Sat, 25 Mar 2017 23:34:09 +0000
|
|
|
151578 |
Subject: [PATCH] rescue: Don't document --suggest option in --help output.
|
|
|
151578 |
|
|
|
151578 |
Also fix the docs test to ignore it.
|
|
|
151578 |
|
|
|
151578 |
Updates/fixes commit 33d2ae796119ae5dd38e2afcbf1ba4216bd99846.
|
|
|
151578 |
|
|
|
151578 |
(cherry picked from commit aa7b7e26c3aa434f2b299055df63c52fb3a2f93f)
|
|
|
151578 |
---
|
|
|
151578 |
rescue/rescue.c | 1 -
|
|
|
151578 |
rescue/test-virt-rescue-docs.sh | 3 ++-
|
|
|
151578 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
151578 |
|
|
|
151578 |
diff --git a/rescue/rescue.c b/rescue/rescue.c
|
|
|
151578 |
index a1aac53e4..6f9dcd733 100644
|
|
|
151578 |
--- a/rescue/rescue.c
|
|
|
151578 |
+++ b/rescue/rescue.c
|
|
|
151578 |
@@ -101,7 +101,6 @@ usage (int status)
|
|
|
151578 |
" --scratch[=N] Add scratch disk(s)\n"
|
|
|
151578 |
" --selinux For backwards compat only, does nothing\n"
|
|
|
151578 |
" --smp N Enable SMP with N >= 2 virtual CPUs\n"
|
|
|
151578 |
- " --suggest Suggest mount commands for this guest\n"
|
|
|
151578 |
" -v|--verbose Verbose messages\n"
|
|
|
151578 |
" -V|--version Display version and exit\n"
|
|
|
151578 |
" -w|--rw Mount read-write\n"
|
|
|
151578 |
diff --git a/rescue/test-virt-rescue-docs.sh b/rescue/test-virt-rescue-docs.sh
|
|
|
151578 |
index 25f8f6095..e5fbf26f4 100755
|
|
|
151578 |
--- a/rescue/test-virt-rescue-docs.sh
|
|
|
151578 |
+++ b/rescue/test-virt-rescue-docs.sh
|
|
|
151578 |
@@ -21,4 +21,5 @@ set -e
|
|
|
151578 |
$TEST_FUNCTIONS
|
|
|
151578 |
skip_if_skipped
|
|
|
151578 |
|
|
|
151578 |
-$top_srcdir/podcheck.pl virt-rescue.pod virt-rescue
|
|
|
151578 |
+$top_srcdir/podcheck.pl virt-rescue.pod virt-rescue \
|
|
|
151578 |
+ --ignore=--suggest
|
|
|
151578 |
--
|
|
|
151578 |
2.14.3
|
|
|
151578 |
|