dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

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

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