dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

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

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