dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

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

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