-
-
Notifications
You must be signed in to change notification settings - Fork 11
/
0007-Use-grub-name-spaced-for-its-options.patch
95 lines (82 loc) · 3.82 KB
/
0007-Use-grub-name-spaced-for-its-options.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
From 30e840dbc557645c52f060e8e44ff6fedee8c52b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
<frederic.pierret@qubes-os.org>
Date: Tue, 10 Jan 2023 09:47:22 +0100
Subject: [PATCH] Use grub name-spaced for its options
---
data/anaconda.conf | 4 ++--
data/profile.d/qubesos.conf | 4 ++--
pyanaconda/core/configuration/bootloader.py | 8 ++++----
pyanaconda/modules/storage/bootloader/grub2.py | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/data/anaconda.conf b/data/anaconda.conf
index 60d09ded28..aad2dc0979 100644
--- a/data/anaconda.conf
+++ b/data/anaconda.conf
@@ -161,10 +161,10 @@ preserved_arguments =
nosmt vga
# Disable the GRUB submenu
-disable_submenu = True
+disable_grub_submenu = True
# Set GRUB terminal type
-terminal_type =
+grub_terminal_type =
additional_default_grub_options =
diff --git a/data/profile.d/qubesos.conf b/data/profile.d/qubesos.conf
index 2dffe345c0..f43a0d4b98 100644
--- a/data/profile.d/qubesos.conf
+++ b/data/profile.d/qubesos.conf
@@ -41,8 +41,8 @@ selinux = -1
[Bootloader]
efi_dir = qubes
-disable_submenu = False
-terminal_type = gfxterm
+disable_grub_submenu = False
+grub_terminal_type = gfxterm
additional_default_grub_options =
GRUB_THEME="/boot/grub2/themes/qubes/theme.txt"
GRUB_CMDLINE_XEN_DEFAULT="console=none dom0_mem=min:1024M dom0_mem=max:4096M ucode=scan smt=off gnttab_max_frames=2048 gnttab_max_maptrack_frames=4096"
diff --git a/pyanaconda/core/configuration/bootloader.py b/pyanaconda/core/configuration/bootloader.py
index 89d3b8d075..6a0b951852 100644
--- a/pyanaconda/core/configuration/bootloader.py
+++ b/pyanaconda/core/configuration/bootloader.py
@@ -56,9 +56,9 @@ class BootloaderSection(Section):
return self._get_option("menu_auto_hide", bool)
@property
- def disable_submenu(self):
+ def disable_grub_submenu(self):
"""Disable the GRUB submenu."""
- return self._get_option("disable_submenu", bool)
+ return self._get_option("disable_grub_submenu", bool)
@property
def nonibft_iscsi_boot(self):
@@ -78,9 +78,9 @@ class BootloaderSection(Section):
return self._get_option("preserved_arguments", str).split()
@property
- def terminal_type(self):
+ def grub_terminal_type(self):
"""Terminal type."""
- return self._get_option("terminal_type", str)
+ return self._get_option("grub_terminal_type", str)
@property
def additional_default_grub_options(self):
diff --git a/pyanaconda/modules/storage/bootloader/grub2.py b/pyanaconda/modules/storage/bootloader/grub2.py
index fc3df80487..f21d32f25c 100644
--- a/pyanaconda/modules/storage/bootloader/grub2.py
+++ b/pyanaconda/modules/storage/bootloader/grub2.py
@@ -256,12 +256,12 @@ class GRUB2(BootLoader):
defaults.write("GRUB_TIMEOUT=%d\n" % self.timeout)
defaults.write("GRUB_DISTRIBUTOR=\"$(sed 's, release .*$,,g' /etc/system-release)\"\n")
defaults.write("GRUB_DEFAULT=saved\n")
- defaults.write("GRUB_DISABLE_SUBMENU=%s\n" % str(conf.bootloader.disable_submenu).lower())
+ defaults.write("GRUB_DISABLE_SUBMENU=%s\n" % str(conf.bootloader.disable_grub_submenu).lower())
if self.console and self.has_serial_console:
defaults.write("GRUB_TERMINAL=\"serial console\"\n")
defaults.write("GRUB_SERIAL_COMMAND=\"%s\"\n" % self.serial_command)
else:
- defaults.write("GRUB_TERMINAL_OUTPUT=\"%s\"\n" % conf.bootloader.terminal_type or self.terminal_type)
+ defaults.write("GRUB_TERMINAL_OUTPUT=\"%s\"\n" % conf.bootloader.grub_terminal_type or self.terminal_type)
# this is going to cause problems for systems containing multiple
# linux installations or even multiple boot entries with different
--
2.45.2