diff --git a/kiwi/bootloader/config/grub2.py b/kiwi/bootloader/config/grub2.py index 461b168c0..120088d6b 100644 --- a/kiwi/bootloader/config/grub2.py +++ b/kiwi/bootloader/config/grub2.py @@ -766,15 +766,6 @@ class BootLoaderConfigGrub2(BootLoaderConfigBase): if self.custom_args.get('crypto_disk'): grub_default_entries['GRUB_ENABLE_CRYPTODISK'] = 'y' - enable_blscfg_implemented = Command.run( - [ - 'grep', '-q', 'GRUB_ENABLE_BLSCFG', - self._get_grub2_mkconfig_tool() - ], raise_on_error=False - ) - if enable_blscfg_implemented.returncode == 0: - grub_default_entries['GRUB_ENABLE_BLSCFG'] = 'true' - if grub_default_entries: log.info('Writing grub2 defaults file') grub_default_location = ''.join([self.root_dir, '/etc/default/']) diff --git a/test/unit/bootloader/config/grub2_test.py b/test/unit/bootloader/config/grub2_test.py index 19e0f4d98..daf8e5868 100644 --- a/test/unit/bootloader/config/grub2_test.py +++ b/test/unit/bootloader/config/grub2_test.py @@ -580,7 +580,6 @@ class TestBootLoaderConfigGrub2: ), call('GRUB_CMDLINE_LINUX_DEFAULT', '"some-cmdline"'), call('GRUB_DISTRIBUTOR', '"Bob"'), - call('GRUB_ENABLE_BLSCFG', 'true'), call('GRUB_ENABLE_CRYPTODISK', 'y'), call('GRUB_GFXMODE', '800x600'), call( @@ -626,7 +625,6 @@ class TestBootLoaderConfigGrub2: call('GRUB_CMDLINE_LINUX', '"root=LABEL=some-label"'), call('GRUB_DISABLE_LINUX_UUID', 'true'), call('GRUB_DISTRIBUTOR', '"Bob"'), - call('GRUB_ENABLE_BLSCFG', 'true'), call('GRUB_ENABLE_CRYPTODISK', 'y'), call('GRUB_ENABLE_LINUX_LABEL', 'true'), call('GRUB_GFXMODE', '800x600'), @@ -671,7 +669,6 @@ class TestBootLoaderConfigGrub2: call('GRUB_DISABLE_LINUX_PARTUUID', 'false'), call('GRUB_DISABLE_LINUX_UUID', 'true'), call('GRUB_DISTRIBUTOR', '"Bob"'), - call('GRUB_ENABLE_BLSCFG', 'true'), call('GRUB_ENABLE_CRYPTODISK', 'y'), call('GRUB_GFXMODE', '800x600'), call( @@ -715,7 +712,6 @@ class TestBootLoaderConfigGrub2: call('GRUB_CMDLINE_LINUX_DEFAULT', '"abcd console=tty0"'), call('GRUB_DISABLE_LINUX_UUID', 'true'), call('GRUB_DISTRIBUTOR', '"Bob"'), - call('GRUB_ENABLE_BLSCFG', 'true'), call('GRUB_ENABLE_CRYPTODISK', 'y'), call('GRUB_ENABLE_LINUX_LABEL', 'true'), call('GRUB_GFXMODE', '800x600'),