mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-10-19 02:05:42 +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>
28 lines
1.2 KiB
Diff
28 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Robert Marshall <rmarshall@redhat.com>
|
|
Date: Mon, 22 Feb 2016 15:30:05 -0500
|
|
Subject: [PATCH] Warn if grub password will not be read (#1290803)
|
|
|
|
It is possible for a system to have never run grub-mkconfig and add the
|
|
section that reads the user.cfg file which contains a user set GRUB
|
|
password. Users in that scenario will now be warned that grub-mkconfig
|
|
must be run prior to their newly set password taking effect.
|
|
|
|
Resolves: rhbz#1290803
|
|
---
|
|
util/grub-setpassword.in | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in
|
|
index dd76f00fc0e..fb9d3a3b6f9 100644
|
|
--- a/util/grub-setpassword.in
|
|
+++ b/util/grub-setpassword.in
|
|
@@ -121,3 +121,8 @@ fi
|
|
install -m 0600 /dev/null "${grubdir}/user.cfg" 2>/dev/null || :
|
|
chmod 0600 "${grubdir}/user.cfg" 2>/dev/null || :
|
|
echo "GRUB2_PASSWORD=${MYPASS}" > "${grubdir}/user.cfg"
|
|
+
|
|
+if ! grep -q "^### BEGIN /etc/grub.d/01_users ###$" "${grubdir}/grub.cfg"; then
|
|
+ echo "WARNING: The current configuration lacks password support!"
|
|
+ echo "Update your configuration with @grub_mkconfig@ to support this feature."
|
|
+fi
|