Merge pull request #629 from agraf/linuxefi-non-x86

Do not emit linuxefi/initrdefi on non-x86 platforms
This commit is contained in:
Marcus Schäfer 2018-02-16 14:52:08 +01:00 committed by GitHub
commit 4e6374bc5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -555,8 +555,10 @@ class BootLoaderConfigGrub2(BootLoaderConfigBase):
if os.path.exists(os.sep.join([self.root_dir, theme_background])):
grub_default_entries['GRUB_BACKGROUND'] = theme_background
if self.firmware.efi_mode():
grub_default_entries['GRUB_USE_LINUXEFI'] = 'true'
grub_default_entries['GRUB_USE_INITRDEFI'] = 'true'
# linuxefi/initrdefi only exist on x86, others always use efi
if self.arch == 'ix86' or self.arch == 'x86_64':
grub_default_entries['GRUB_USE_LINUXEFI'] = 'true'
grub_default_entries['GRUB_USE_INITRDEFI'] = 'true'
if self.xml_state.build_type.get_btrfs_root_is_snapshot():
grub_default_entries['SUSE_BTRFS_SNAPSHOT_BOOTING'] = 'true'