Skip to content

Commit

Permalink
Drop support for syslinux/isolinux
Browse files Browse the repository at this point in the history
SYSLINUX has been abandoned for several years now, and it does not
even work with modern versions of the filesystems supported in kiwi.
This commit drops it and Fixes #2433
  • Loading branch information
schaefi committed Jan 26, 2024
1 parent 4e1d2cf commit 0425154
Show file tree
Hide file tree
Showing 29 changed files with 119 additions and 1,609 deletions.
1 change: 0 additions & 1 deletion kiwi/bootloader/config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ def new(
name_map = {
'grub2': {'grub2': 'BootLoaderConfigGrub2'},
'grub2_s390x_emu': {'grub2': 'BootLoaderConfigGrub2'},
'isolinux': {'isolinux': 'BootLoaderConfigIsoLinux'},
'systemd_boot': {'systemd_boot': 'BootLoaderSystemdBoot'}
}
try:
Expand Down
7 changes: 1 addition & 6 deletions kiwi/bootloader/config/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -353,10 +353,7 @@ def get_install_image_boot_default(self, loader=None):
log.warning('Switching to standard install')
boot_id = 1

if loader and loader == 'isolinux':
return menu_list[boot_id].name
else:
return menu_list[boot_id].menu_id
return menu_list[boot_id].menu_id

def get_boot_path(self, target='disk'):
"""
Expand Down Expand Up @@ -499,8 +496,6 @@ def get_gfxmode(self, target):

if target == 'grub2':
return gfxmode_map[gfxmode].grub2
elif target == 'isolinux':
return gfxmode_map[gfxmode].isolinux
else:
return gfxmode

Expand Down
2 changes: 1 addition & 1 deletion kiwi/bootloader/config/grub2.py
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,7 @@ def _setup_bios_image(self, mbrid, lookup_path=None):
os.sep.join(
[
self._get_bios_modules_path(lookup_path),
Defaults.get_isolinux_bios_grub_loader()
Defaults.get_iso_grub_loader()
]
)
]
Expand Down
241 changes: 0 additions & 241 deletions kiwi/bootloader/config/isolinux.py

This file was deleted.

Loading

0 comments on commit 0425154

Please sign in to comment.