mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-10-18 09:51:50 +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>
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 //"
|
|
}
|