Skip to content

Set default grub terminal output type to: console #2982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
schaefi wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −6
Draft

Set default grub terminal output type to: console #2982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions kiwi/bootloader/config/grub2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,8 @@ def post_init(self, custom_args):
if self.custom_args and 'config_options' in self.custom_args:
self.config_options = self.custom_args['config_options']

# This default output terminal type will change to console
# with the next major kiwi version update. Also see:
# https://github.com/OSInside/kiwi/issues/2494
self.terminal_output = \
self.xml_state.get_build_type_bootloader_console()[0] or 'gfxterm'
self.xml_state.get_build_type_bootloader_console()[0] or 'console'

self.terminal_input = \
self.xml_state.get_build_type_bootloader_console()[1] or 'console'
Expand Down
4 changes: 2 additions & 2 deletions test/unit/bootloader/config/grub2_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1133,7 +1133,7 @@ def test_setup_live_image_config_multiboot(self):
)
self.bootloader.setup_live_image_config(self.mbrid)
self.grub2.get_multiboot_iso_template.assert_called_once_with(
True, True, False, None, False
True, False, False, None, False
)

@patch.object(BootLoaderConfigGrub2, '_copy_grub_config_to_efi_path')
Expand Down Expand Up @@ -1322,7 +1322,7 @@ def test_setup_install_image_config_standard(
self.bootloader.multiboot = False
self.bootloader.setup_install_image_config(self.mbrid)
self.grub2.get_install_template.assert_called_once_with(
True, True, False, True, True
True, False, False, True, True
)
mock_copy_grub_config_to_efi_path.assert_called_once_with(
'root_dir', 'earlyboot.cfg', 'iso'
Expand Down
Loading