mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 14:32:58 +00:00
1f092caba7
Add comments and revert logic changes in 01_fallback_counting Remove quotes when reading ID value from /etc/os-release Related: rhbz#1650706 blscfg: expand grub_users before passing to grub_normal_add_menu_entry() Resolves: rhbz#1650706 Drop buggy downstream patch "efinet: retransmit if our device is busy" Resolves: rhbz#1649048 Make the menu entry users option argument to be optional Related: rhbz#1652434 10_linux_bls: add missing menu entries options Resolves: rhbz#1652434 Drop "Be more aggro about actually using the *configured* network device." Resolves: rhbz#1654388 Fix menu entry selection based on title Resolves: rhbz#1654936 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
88 lines
3.1 KiB
Diff
88 lines
3.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Sat, 23 Jun 2018 13:19:15 -0400
|
|
Subject: [PATCH] Make grub-set-password be named like all the other grub
|
|
utilities
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
configure.ac | 2 +-
|
|
Makefile.util.def | 4 ++--
|
|
.gitignore | 4 ++--
|
|
util/{grub-setpassword.8 => grub-set-password.8} | 8 ++++----
|
|
util/{grub-setpassword.in => grub-set-password.in} | 0
|
|
5 files changed, 9 insertions(+), 9 deletions(-)
|
|
rename util/{grub-setpassword.8 => grub-set-password.8} (50%)
|
|
rename util/{grub-setpassword.in => grub-set-password.in} (100%)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 359cac3c26b..5f47a9265f3 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -66,7 +66,7 @@ grub_TRANSFORM([grub-mkrelpath])
|
|
grub_TRANSFORM([grub-mkrescue])
|
|
grub_TRANSFORM([grub-probe])
|
|
grub_TRANSFORM([grub-reboot])
|
|
-grub_TRANSFORM([grub-setpassword])
|
|
+grub_TRANSFORM([grub-set-password])
|
|
grub_TRANSFORM([grub-rpm-sort])
|
|
grub_TRANSFORM([grub-script-check])
|
|
grub_TRANSFORM([grub-set-default])
|
|
diff --git a/Makefile.util.def b/Makefile.util.def
|
|
index 5da55393291..97cd8bdebd9 100644
|
|
--- a/Makefile.util.def
|
|
+++ b/Makefile.util.def
|
|
@@ -756,8 +756,8 @@ script = {
|
|
};
|
|
|
|
script = {
|
|
- name = grub-setpassword;
|
|
- common = util/grub-setpassword.in;
|
|
+ name = grub-set-password;
|
|
+ common = util/grub-set-password.in;
|
|
mansection = 8;
|
|
installdir = sbin;
|
|
};
|
|
diff --git a/.gitignore b/.gitignore
|
|
index 6c4cfc53781..a999024652e 100644
|
|
--- a/.gitignore
|
|
+++ b/.gitignore
|
|
@@ -115,8 +115,8 @@ grub-*.tar.*
|
|
/grub*-set-bootflag.1
|
|
/grub*-set-default
|
|
/grub*-set-default.8
|
|
-/grub*-setsetpassword
|
|
-/grub*-setsetpassword.8
|
|
+/grub*-set-password
|
|
+/grub*-set-password.8
|
|
/grub*-shell
|
|
/grub*-shell-tester
|
|
/grub*-sparc64-setup
|
|
diff --git a/util/grub-setpassword.8 b/util/grub-set-password.8
|
|
similarity index 50%
|
|
rename from util/grub-setpassword.8
|
|
rename to util/grub-set-password.8
|
|
index dc91dd6697b..9646546e43d 100644
|
|
--- a/util/grub-setpassword.8
|
|
+++ b/util/grub-set-password.8
|
|
@@ -1,12 +1,12 @@
|
|
-.TH GRUB-SETPASSWORD 3 "Thu Jun 25 2015"
|
|
+.TH GRUB-SET-PASSWORD 3 "Thu Jun 25 2015"
|
|
.SH NAME
|
|
-\fBgrub-setpassword\fR \(em Generate the user.cfg file containing the hashed grub bootloader password.
|
|
+\fBgrub-set-password\fR \(em Generate the user.cfg file containing the hashed grub bootloader password.
|
|
|
|
.SH SYNOPSIS
|
|
-\fBgrub-setpassword\fR [OPTION]
|
|
+\fBgrub-set-password\fR [OPTION]
|
|
|
|
.SH DESCRIPTION
|
|
-\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.
|
|
+\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.
|
|
|
|
The file has the format:
|
|
GRUB2_PASSWORD=<\fIhashed password\fR>.
|
|
diff --git a/util/grub-setpassword.in b/util/grub-set-password.in
|
|
similarity index 100%
|
|
rename from util/grub-setpassword.in
|
|
rename to util/grub-set-password.in
|