mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-12-01 00:48:18 +00:00
ad4aff0c12
Apparently working on two identical trees at once is not good for doing things right. Resolves: rhbz#1601578 Signed-off-by: Peter Jones <pjones@redhat.com>
27 lines
961 B
Diff
27 lines
961 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Robert Marshall <rmarshall@redhat.com>
|
|
Date: Fri, 29 Jan 2016 16:56:11 -0500
|
|
Subject: [PATCH] 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 //"
|
|
}
|