Blame SOURCES/0186-01_users-Handle-GRUB_PASSWORD-better.patch

d41074
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
a85e8e
From: Peter Jones <pjones@redhat.com>
a85e8e
Date: Fri, 4 Dec 2015 09:28:38 -0500
d41074
Subject: [PATCH] 01_users: Handle GRUB_PASSWORD better.
a85e8e
a85e8e
Only handle GRUB_PASSWORD not GRUB2_PASSWORD (as that's more likely to
a85e8e
be acceptable upstream).
a85e8e
a85e8e
Related: rhbz#1284370
a85e8e
a85e8e
Signed-off-by: Peter Jones <pjones@redhat.com>
a85e8e
---
a85e8e
 util/grub-setpassword.8 | 2 +-
a85e8e
 util/grub.d/01_users.in | 2 +-
a85e8e
 2 files changed, 2 insertions(+), 2 deletions(-)
a85e8e
a85e8e
diff --git a/util/grub-setpassword.8 b/util/grub-setpassword.8
d41074
index 5973abef4ab..49200a848b7 100644
a85e8e
--- a/util/grub-setpassword.8
a85e8e
+++ b/util/grub-setpassword.8
a85e8e
@@ -9,7 +9,7 @@
a85e8e
 \fBgrub-setpassword\fR outputs the user.cfg file which contains the hashed GRUB bootloader password. This utility only supports configurations where there is a single root user.
a85e8e
 
a85e8e
 The file has the format:
a85e8e
-GRUB_2PASSWORD=<\fIhashed password\fR>.
a85e8e
+GRUB2_PASSWORD=<\fIhashed password\fR>.
a85e8e
 
a85e8e
 .SH OPTIONS
a85e8e
 .TP
a85e8e
diff --git a/util/grub.d/01_users.in b/util/grub.d/01_users.in
d41074
index facd409e722..db2f44bfb78 100644
a85e8e
--- a/util/grub.d/01_users.in
a85e8e
+++ b/util/grub.d/01_users.in
a85e8e
@@ -2,7 +2,7 @@
a85e8e
 cat << EOF
a85e8e
 if [ -f \${prefix}/user.cfg ]; then
a85e8e
   source \${prefix}/user.cfg
a85e8e
-  if [ -n \${GRUB2_PASSWORD} ]; then
a85e8e
+  if [ -n "\${GRUB2_PASSWORD}" ]; then
a85e8e
     set superusers="root"
a85e8e
     export superusers
a85e8e
     password_pbkdf2 root \${GRUB2_PASSWORD}