almalinux/kiwi-el8
14
0
Fork 0
Code Issues Pull Requests Releases Activity

Use auto video mode as default for grub

Browse Source 
An explicit video mode 800x600 was used for grub if no
video mode setup exists in the XML description. For grub
this should better result in the auto mode. Related to
bsc#1165730
This commit is contained in:
Marcus Schäfer 2020-04-29 11:14:53 +02:00
parent 0ab5fe6b90
commit 43c00d0b09
No known key found for this signature in database
GPG Key ID: AD11DD02B44996EF
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kiwi/defaults.py
View File

@ -299,6 +299,7 @@ class Defaults:
'0x319': video_type(grub2='1280x1024', isolinux='1280 1024'),
'0x31a': video_type(grub2='1280x1024', isolinux='1280 1024'),
'0x31b': video_type(grub2='1280x1024', isolinux='1280 1024'),
'auto': video_type(grub2='auto', isolinux='800 600')
}
@staticmethod
@ -337,13 +338,15 @@ class Defaults:
@staticmethod
def get_default_video_mode():
"""
Provides 800x600 default video mode as hex value for the kernel
Uses auto mode for default video. See get_video_mode_map
for details on the value depending which bootloader is
used
:return: vesa video kernel hex value
:return: auto
:rtype: str
"""
return '0x303'
return 'auto'
@staticmethod
def get_grub_boot_directory_name(lookup_path):

2
test/unit/bootloader/config/base_test.py
View File

@ -261,7 +261,7 @@ class TestBootLoaderConfigBase:
def test_get_gfxmode_default(self, mock_get_vga):
mock_get_vga.return_value = None
assert self.bootloader.get_gfxmode('isolinux') == '800 600'
assert self.bootloader.get_gfxmode('grub2') == '800x600'
assert self.bootloader.get_gfxmode('grub2') == 'auto'
@patch('kiwi.xml_parse.type_.get_vga')
def test_get_gfxmode(self, mock_get_vga):