752ceb1
From 89e886b7fe0dd22d1fb7f54963b0a74e6e0784a2 Mon Sep 17 00:00:00 2001
752ceb1
From: Peter Jones <pjones@redhat.com>
752ceb1
Date: Sat, 23 Jun 2018 13:19:15 -0400
752ceb1
Subject: [PATCH] Make grub-set-password be named like all the other grub
752ceb1
 utilities
752ceb1
752ceb1
Signed-off-by: Peter Jones <pjones@redhat.com>
752ceb1
---
752ceb1
 configure.ac                                       | 2 +-
752ceb1
 Makefile.util.def                                  | 4 ++--
752ceb1
 .gitignore                                         | 4 ++--
752ceb1
 util/{grub-setpassword.8 => grub-set-password.8}   | 8 ++++----
752ceb1
 util/{grub-setpassword.in => grub-set-password.in} | 0
752ceb1
 5 files changed, 9 insertions(+), 9 deletions(-)
752ceb1
 rename util/{grub-setpassword.8 => grub-set-password.8} (50%)
752ceb1
 rename util/{grub-setpassword.in => grub-set-password.in} (100%)
752ceb1
752ceb1
diff --git a/configure.ac b/configure.ac
752ceb1
index aef90611168..aa7632b56c3 100644
752ceb1
--- a/configure.ac
752ceb1
+++ b/configure.ac
752ceb1
@@ -66,7 +66,7 @@ grub_TRANSFORM([grub-mkrelpath])
752ceb1
 grub_TRANSFORM([grub-mkrescue])
752ceb1
 grub_TRANSFORM([grub-probe])
752ceb1
 grub_TRANSFORM([grub-reboot])
752ceb1
-grub_TRANSFORM([grub-setpassword])
752ceb1
+grub_TRANSFORM([grub-set-password])
752ceb1
 grub_TRANSFORM([grub-rpm-sort])
752ceb1
 grub_TRANSFORM([grub-script-check])
752ceb1
 grub_TRANSFORM([grub-set-default])
752ceb1
diff --git a/Makefile.util.def b/Makefile.util.def
752ceb1
index 72be14449c5..c81801cdacf 100644
752ceb1
--- a/Makefile.util.def
752ceb1
+++ b/Makefile.util.def
752ceb1
@@ -750,8 +750,8 @@ script = {
752ceb1
 };
752ceb1
 
752ceb1
 script = {
752ceb1
-  name = grub-setpassword;
752ceb1
-  common = util/grub-setpassword.in;
752ceb1
+  name = grub-set-password;
752ceb1
+  common = util/grub-set-password.in;
752ceb1
   mansection = 8;
752ceb1
   installdir = sbin;
752ceb1
 };
752ceb1
diff --git a/.gitignore b/.gitignore
752ceb1
index 4a945596fea..5c09a474ba9 100644
752ceb1
--- a/.gitignore
752ceb1
+++ b/.gitignore
752ceb1
@@ -109,8 +109,8 @@ grub-*.tar.*
752ceb1
 /grub*-script-check.1
752ceb1
 /grub*-set-default
752ceb1
 /grub*-set-default.8
752ceb1
-/grub*-setsetpassword
752ceb1
-/grub*-setsetpassword.8
752ceb1
+/grub*-set-password
752ceb1
+/grub*-set-password.8
752ceb1
 /grub*-shell
752ceb1
 /grub*-shell-tester
752ceb1
 /grub*-sparc64-setup
752ceb1
diff --git a/util/grub-setpassword.8 b/util/grub-set-password.8
752ceb1
similarity index 50%
752ceb1
rename from util/grub-setpassword.8
752ceb1
rename to util/grub-set-password.8
752ceb1
index dc91dd6697b..9646546e43d 100644
752ceb1
--- a/util/grub-setpassword.8
752ceb1
+++ b/util/grub-set-password.8
752ceb1
@@ -1,12 +1,12 @@
752ceb1
-.TH GRUB-SETPASSWORD 3 "Thu Jun 25 2015"
752ceb1
+.TH GRUB-SET-PASSWORD 3 "Thu Jun 25 2015"
752ceb1
 .SH NAME
752ceb1
-\fBgrub-setpassword\fR \(em Generate the user.cfg file containing the hashed grub bootloader password.
752ceb1
+\fBgrub-set-password\fR \(em Generate the user.cfg file containing the hashed grub bootloader password.
752ceb1
 
752ceb1
 .SH SYNOPSIS
752ceb1
-\fBgrub-setpassword\fR [OPTION]
752ceb1
+\fBgrub-set-password\fR [OPTION]
752ceb1
 
752ceb1
 .SH DESCRIPTION
752ceb1
-\fBgrub-setpassword\fR outputs the user.cfg file which contains the hashed GRUB bootloader password. This utility only supports configurations where there is a single root user.
752ceb1
+\fBgrub-set-password\fR outputs the user.cfg file which contains the hashed GRUB bootloader password. This utility only supports configurations where there is a single root user.
752ceb1
 
752ceb1
 The file has the format:
752ceb1
 GRUB2_PASSWORD=<\fIhashed password\fR>.
752ceb1
diff --git a/util/grub-setpassword.in b/util/grub-set-password.in
752ceb1
similarity index 100%
752ceb1
rename from util/grub-setpassword.in
752ceb1
rename to util/grub-set-password.in