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

Include loadenv as a default module for grub images

Browse Source 
This commit includes the 'loadenv' module to the list of basic grub
modules. This makes sure the module is included in any grub-mkimage
that KIWI does.

Fixes #1547
This commit is contained in:
David Cassany 2020-09-14 22:04:30 +02:00
parent 476dd235f9
commit 3bb2ab77fb
No known key found for this signature in database
GPG Key ID: D91C0AAD9018D486
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kiwi/defaults.py
View File

@ -455,7 +455,8 @@ class Defaults:
'crypto',
'cryptodisk',
'test',
'true'
'true',
'loadenv'
]
if multiboot:
modules.append('multiboot')

16
test/unit/bootloader/config/grub2_test.py
View File

@ -717,8 +717,8 @@ class TestBootLoaderConfigGrub2:
'gettext', 'font', 'minicmd', 'gfxterm', 'gfxmenu',
'all_video', 'xfs', 'btrfs', 'lvm', 'luks',
'gcry_rijndael', 'gcry_sha256', 'gcry_sha512', 'crypto',
'cryptodisk', 'test', 'true', 'multiboot', 'part_gpt',
'part_msdos', 'efi_gop', 'efi_uga', 'linuxefi'
'cryptodisk', 'test', 'true', 'loadenv', 'multiboot',
'part_gpt', 'part_msdos', 'efi_gop', 'efi_uga', 'linuxefi'
]
)
]
@ -789,8 +789,8 @@ class TestBootLoaderConfigGrub2:
'gettext', 'font', 'minicmd', 'gfxterm', 'gfxmenu',
'all_video', 'xfs', 'btrfs', 'lvm', 'luks',
'gcry_rijndael', 'gcry_sha256', 'gcry_sha512', 'crypto',
'cryptodisk', 'test', 'true', 'part_gpt', 'part_msdos',
'efi_gop', 'efi_uga', 'linuxefi'
'cryptodisk', 'test', 'true', 'loadenv', 'part_gpt',
'part_msdos', 'efi_gop', 'efi_uga', 'linuxefi'
]
)
]
@ -1201,8 +1201,8 @@ class TestBootLoaderConfigGrub2:
'gettext', 'font', 'minicmd', 'gfxterm', 'gfxmenu',
'all_video', 'xfs', 'btrfs', 'lvm', 'luks',
'gcry_rijndael', 'gcry_sha256', 'gcry_sha512',
'crypto', 'cryptodisk', 'test', 'true', 'part_gpt',
'part_msdos', 'biosdisk', 'vga', 'vbe',
'crypto', 'cryptodisk', 'test', 'true', 'loadenv',
'part_gpt', 'part_msdos', 'biosdisk', 'vga', 'vbe',
'chain', 'boot'
]
),
@ -1226,8 +1226,8 @@ class TestBootLoaderConfigGrub2:
'gettext', 'font', 'minicmd', 'gfxterm', 'gfxmenu',
'all_video', 'xfs', 'btrfs', 'lvm', 'luks',
'gcry_rijndael', 'gcry_sha256', 'gcry_sha512',
'crypto', 'cryptodisk', 'test', 'true', 'part_gpt',
'part_msdos', 'efi_gop', 'efi_uga', 'linuxefi'
'crypto', 'cryptodisk', 'test', 'true', 'loadenv',
'part_gpt', 'part_msdos', 'efi_gop', 'efi_uga', 'linuxefi'
]
)
]