mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 14:32:58 +00:00
5e72956199
This reverts commit 93004a8494,
because it broke Rawhide. It also tries to fixes BLS ostree
detection to work in chroots (e.g. during installation) by also
checking for /ostree/repo.
32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Thu, 23 Jul 2020 09:27:36 +0200
|
|
Subject: [PATCH] systemd-integration.sh: Also set old menu_show_once grubenv
|
|
var
|
|
|
|
Downstream RH / Fedora patch for compatibility with old, not (yet)
|
|
regenerated grub.cfg files which miss the menu_show_once_timeout check.
|
|
This older grubenv variable leads to a fixed timeout of 60 seconds.
|
|
|
|
Note that the new menu_show_once_timeout will overrule these 60 seconds
|
|
if both are set and the grub.cfg does have the menu_show_once_timeout
|
|
check.
|
|
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
---
|
|
util/systemd/systemd-integration.sh.in | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/util/systemd/systemd-integration.sh.in b/util/systemd/systemd-integration.sh.in
|
|
index dc1218597bc..a4c071c5b0c 100644
|
|
--- a/util/systemd/systemd-integration.sh.in
|
|
+++ b/util/systemd/systemd-integration.sh.in
|
|
@@ -4,3 +4,8 @@ TIMEOUT_USEC=$(cat /run/systemd/reboot-to-boot-loader-menu)
|
|
TIMEOUT=$(((TIMEOUT_USEC + 500000) / 1000000))
|
|
|
|
@grub_editenv@ - set menu_show_once_timeout=$TIMEOUT
|
|
+
|
|
+# Downstream RH / Fedora patch for compatibility with old, not (yet)
|
|
+# regenerated grub.cfg files which miss the menu_show_once_timeout check
|
|
+# this older grubenv variable leads to a fixed timeout of 60 seconds
|
|
+@grub_editenv@ - set menu_show_once=1
|