Cleanup condition for SECURE_BOOT=yes|no

The statement serves the purpose for an if/else construction to become a better read. In addition delete the probably left-over print statement from the test
OSInside · Jul 24, 2023 · f223e61 · f223e61
1 parent af6f34e
commit f223e61
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/kiwi/bootloader/config/grub2.py b/kiwi/bootloader/config/grub2.py
@@ -580,7 +580,7 @@ def _setup_sysconfig_bootloader(self):
             sysconfig_bootloader_entries['TRUSTED_BOOT'] = 'yes'
         if self.firmware.efi_mode() == 'uefi':
             sysconfig_bootloader_entries['SECURE_BOOT'] = 'yes'
-        if self.firmware.efi_mode() == 'efi':
+        elif self.firmware.efi_mode() == 'efi':
             sysconfig_bootloader_entries['SECURE_BOOT'] = 'no'
         if self.cmdline:
             sysconfig_bootloader_entries['DEFAULT_APPEND'] = '"{0}"'.format(

diff --git a/test/unit/bootloader/config/grub2_test.py b/test/unit/bootloader/config/grub2_test.py
@@ -789,7 +789,6 @@ def test_setup_sysconfig_bootloader_no_secure(
         )
         sysconfig_bootloader.__setitem__.reset_mock()
         self.bootloader._setup_sysconfig_bootloader()
-        print(sysconfig_bootloader.__setitem__.call_args_list)
         assert sysconfig_bootloader.__setitem__.call_args_list == [
             call('DEFAULT_APPEND', '"some-cmdline root=UUID=foo"'),
             call(