ec4acbbd98
- Try to fix things for new compiler madness. I really don't know why gcc decided __attribute__((packed)) on a "typedef struct" should imply __attribute__((align (1))) and that it should have a warning that it does so. The obvious behavior would be to keep the alignment of the first element unless it's used in another object or type that /also/ hask the packed attribute. Why should it change the default alignment at all? - Merge in the BLS patches Javier and I wrote. - Attempt to fix pmtimer initialization failures to not be super duper slow. Signed-off-by: Peter Jones <pjones@redhat.com>
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From 591aa70d3437b3db7fe56975fe1b54b9431a21cd Mon Sep 17 00:00:00 2001
|
|
From: Robert Marshall <rmarshall@redhat.com>
|
|
Date: Mon, 22 Feb 2016 15:30:05 -0500
|
|
Subject: [PATCH 138/206] 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
|
|
--
|
|
2.15.0
|
|
|