dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0189-Clean-up-grub-setpassword-documentation-1290799.patch

4fe85b
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
4fe85b
From: Robert Marshall <rmarshall@redhat.com>
4fe85b
Date: Tue, 26 Jan 2016 10:28:35 -0500
4fe85b
Subject: [PATCH] Clean up grub-setpassword documentation (#1290799)
4fe85b
4fe85b
The output for --help had some errors. Corrected those and polished the
4fe85b
text to be a little easier to follow. Carried verbage over to man page
4fe85b
to maintain internal consistency.
4fe85b
4fe85b
Resolves: rhbz#1290799
4fe85b
---
4fe85b
 util/grub-setpassword.8  |  2 +-
4fe85b
 util/grub-setpassword.in | 15 +++++++--------
4fe85b
 2 files changed, 8 insertions(+), 9 deletions(-)
4fe85b
4fe85b
diff --git a/util/grub-setpassword.8 b/util/grub-setpassword.8
4fe85b
index 49200a848b7..dc91dd6697b 100644
4fe85b
--- a/util/grub-setpassword.8
4fe85b
+++ b/util/grub-setpassword.8
4fe85b
@@ -19,7 +19,7 @@ Display program usage and exit.
4fe85b
 -v, --version
4fe85b
 Display the current version.
4fe85b
 .TP
4fe85b
--o, --output[=\fIDIRECTORY PATH\fR]
4fe85b
+-o, --output=<\fIDIRECTORY\fR>
4fe85b
 Choose the file path to which user.cfg will be written.
4fe85b
 
4fe85b
 .SH SEE ALSO
4fe85b
diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in
4fe85b
index fb9d3a3b6f9..c8c0fa4199d 100755
4fe85b
--- a/util/grub-setpassword.in
4fe85b
+++ b/util/grub-setpassword.in
4fe85b
@@ -16,15 +16,14 @@ grub_mkpasswd="${bindir}/@grub_mkpasswd_pbkdf2@"
4fe85b
 # Print the usage.
4fe85b
 usage () {
4fe85b
     cat <
4fe85b
-Usage: $0 [OPTION] [SOURCE]
4fe85b
-Run GRUB script in a Qemu instance.
4fe85b
-
4fe85b
-  -h, --help              print this message and exit
4fe85b
-  -v, --version           print the version information and exit
4fe85b
-  -o, --output_path       choose a custom output path for user.cfg
4fe85b
-
4fe85b
+Usage: $0 [OPTION]
4fe85b
 $0 prompts the user to set a password on the grub bootloader. The password
4fe85b
-is written to a file named user.cfg.
4fe85b
+is written to a file named user.cfg which lives in the GRUB directory
4fe85b
+located by default at ${grubdir}.
4fe85b
+
4fe85b
+  -h, --help                     print this message and exit
4fe85b
+  -v, --version                  print the version information and exit
4fe85b
+  -o, --output_path <DIRECTORY>  put user.cfg in a user-selected directory
4fe85b
 
4fe85b
 Report bugs at https://bugzilla.redhat.com.
4fe85b
 EOF