mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 14:32:58 +00:00
67f07b7c9e
- Add luks2 to GRUB_MODULES - 20-grub-install: Create a symvers.gz symbolic link - 20-grub-install: Always use fedora as the boot entry --class Resolves: rhbz#1957014 - grub.macros: Install font in /boot/grub2 instead of the ESP Resolves: rhbz#1739762 - grub.macros: Use consistent file mode for legacy and EFI Resolves: rhbz#1965794 - Drop grub2 prelink configuration Resolves: rhbz#1659675 - Remove triggers needed to upgrade from legacy GRUB - Don't harcode grub2 in the spec file - Update to unifont-13.0.06 Resolves: rhbz#1939125 - 20-grub-install: Use relative paths for btrfs in BLS snippets Resolves: rhbz#1906191 - Don't update the cmdline when generating legacy menuentry commands - Suppress gettext error message Resolves: rhbz#1592124 - grub-boot-success.timer: Only run if not in a container Resolves: rhbz#1914571 - grub-set-password: Always use /boot/grub2/user.cfg as password default Resolves: rhbz#1955294 - Remove outdated URL for BLS document Resolves: rhbz#1926453 - templates: Check for EFI at runtime instead of config generation time Resolves: rhbz#1823864 - efi: Print an error if boot to firmware setup is not supported Resolves: rhbz#1823864 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Javier Martinez Canillas <javierm@redhat.com>
|
|
Date: Mon, 5 Jul 2021 18:24:22 +0200
|
|
Subject: [PATCH] grub-set-password: Always use /boot/grub2/user.cfg as
|
|
password default
|
|
|
|
The GRUB configuration file is always placed in /boot/grub2/ now, even for
|
|
EFI. But the tool is still creating the user.cfg in the ESP and not there.
|
|
|
|
Resolves: rhbz#1955294
|
|
|
|
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
|
---
|
|
util/grub-set-password.in | 9 +--------
|
|
1 file changed, 1 insertion(+), 8 deletions(-)
|
|
|
|
diff --git a/util/grub-set-password.in b/util/grub-set-password.in
|
|
index c0b5ebbfdc5..d8005e5a142 100644
|
|
--- a/util/grub-set-password.in
|
|
+++ b/util/grub-set-password.in
|
|
@@ -1,11 +1,6 @@
|
|
#!/bin/sh -e
|
|
|
|
-EFIDIR=$(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/' -e 's/\"//g')
|
|
-if [ -d /sys/firmware/efi/efivars/ ]; then
|
|
- grubdir=`echo "/@bootdirname@/efi/EFI/${EFIDIR}/" | sed 's,//*,/,g'`
|
|
-else
|
|
- grubdir=`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'`
|
|
-fi
|
|
+grubdir=`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'`
|
|
|
|
PACKAGE_VERSION="@PACKAGE_VERSION@"
|
|
PACKAGE_NAME="@PACKAGE_NAME@"
|
|
@@ -116,8 +111,6 @@ if [ -z "${MYPASS}" ]; then
|
|
exit 1
|
|
fi
|
|
|
|
-# on the ESP, these will fail to set the permissions, but it's okay because
|
|
-# the directory is protected.
|
|
install -m 0600 /dev/null "${OUTPUT_PATH}/user.cfg" 2>/dev/null || :
|
|
chmod 0600 "${OUTPUT_PATH}/user.cfg" 2>/dev/null || :
|
|
echo "GRUB2_PASSWORD=${MYPASS}" > "${OUTPUT_PATH}/user.cfg"
|