grub2/0084-Fix-locale-issue-in-grub-setpassword-1294243.patch
Peter Jones 336bf36497 Revert 27e66193, which was replaced by upstream's 49426e9fd
Resolves: rhbz#1251600

Signed-off-by: Peter Jones <pjones@redhat.com>
2016-04-07 11:01:55 -04:00

30 lines
970 B
Diff

From 805a40238db66c43f1d847530704664352621a90 Mon Sep 17 00:00:00 2001
From: Robert Marshall <rmarshall@redhat.com>
Date: Fri, 29 Jan 2016 17:34:02 -0500
Subject: [PATCH 84/89] 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 dd76f00..2923f43 100644
--- a/util/grub-setpassword.in
+++ b/util/grub-setpassword.in
@@ -105,7 +105,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.5.5