81987f4958
- 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>
31 lines
981 B
Diff
31 lines
981 B
Diff
From 124d4da3a6e4e747ab958614cf81c6c71753d36b Mon Sep 17 00:00:00 2001
|
|
From: Robert Marshall <rmarshall@redhat.com>
|
|
Date: Fri, 29 Jan 2016 16:56:11 -0500
|
|
Subject: [PATCH 140/206] Fix locale issue in grub-setpassword (#1294243)
|
|
|
|
A shell substitution was expecting non-translated output to grab the
|
|
hashed password and put it in the user.cfg file. Modified code to force
|
|
the generic C locale when this particular piece of code is run.
|
|
|
|
Resolves: rhbz#1294243
|
|
---
|
|
util/grub-setpassword.in | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in
|
|
index c8c0fa4199d..d7924af5192 100644
|
|
--- a/util/grub-setpassword.in
|
|
+++ b/util/grub-setpassword.in
|
|
@@ -104,7 +104,7 @@ getpass() {
|
|
P1="$1" && shift
|
|
|
|
( echo ${P0} ; echo ${P1} ) | \
|
|
- ${grub_mkpasswd} | \
|
|
+ LC_ALL=C ${grub_mkpasswd} | \
|
|
grep -v '[eE]nter password:' | \
|
|
sed -e "s/PBKDF2 hash of your password is //"
|
|
}
|
|
--
|
|
2.15.0
|
|
|