diff --git a/doc/source/api/kiwi.bootloader.config.rst b/doc/source/api/kiwi.bootloader.config.rst index 49704667358..3aa4909f563 100644 --- a/doc/source/api/kiwi.bootloader.config.rst +++ b/doc/source/api/kiwi.bootloader.config.rst @@ -22,14 +22,6 @@ Submodules :undoc-members: :show-inheritance: -`kiwi.bootloader.config.isolinux` Module ----------------------------------------- - -.. automodule:: kiwi.bootloader.config.isolinux - :members: - :undoc-members: - :show-inheritance: - .. _db_kiwi_bootloader_config_contents: Module Contents diff --git a/doc/source/api/kiwi.bootloader.template.rst b/doc/source/api/kiwi.bootloader.template.rst index 067142b787f..f9993b034f9 100644 --- a/doc/source/api/kiwi.bootloader.template.rst +++ b/doc/source/api/kiwi.bootloader.template.rst @@ -14,14 +14,6 @@ Submodules :undoc-members: :show-inheritance: -`kiwi.bootloader.template.isolinux` Module ------------------------------------------- - -.. automodule:: kiwi.bootloader.template.isolinux - :members: - :undoc-members: - :show-inheritance: - .. _db_kiwi_bootloader_template_content: Module Contents diff --git a/doc/source/concept_and_workflow/systemdeps.rst b/doc/source/concept_and_workflow/systemdeps.rst index 98cfc8bb7db..fb9bfa8cb4b 100644 --- a/doc/source/concept_and_workflow/systemdeps.rst +++ b/doc/source/concept_and_workflow/systemdeps.rst @@ -50,16 +50,6 @@ systemdeps packages: through some BIOS or firmware. * Depends on the `-core` kiwi-systemdeps packages. - .. note:: - - The `iso` type is an exception which might not require the - `-bootloaders` systemdeps. In case of the `firmware` attribute - to be set to `bios`, {kiwi} builds bootable ISO images still - based on isolinux which is provided with the `-iso-media` - systemdeps. However, by default, any {kiwi} created ISO image - is BIOS and EFI capable and based on the grub bootloader which - causes a requirement to the `-bootloaders` systemdeps. - `kiwi-systemdeps-filesystems`: * Supports building `fs-type`, `oem`, `pxe`, `kis` and live `iso` image types. diff --git a/doc/source/image_description/elements.rst b/doc/source/image_description/elements.rst index 9ffc25f0b28..7cb40ef3aab 100644 --- a/doc/source/image_description/elements.rst +++ b/doc/source/image_description/elements.rst @@ -975,7 +975,7 @@ the `dm_integrity` feature: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The `bootloader` element is used to select the bootloader. At the moment, -`grub2`, `systemd_boot`, `isolinux` and the combination of zipl +`grub2`, `systemd_boot` and the combination of zipl plus userspace grub2 `grub2_s390x_emu` are supported. The special `custom` entry allows to skip the bootloader configuration and installation and leaves this up to the user, which can be done by using @@ -992,7 +992,7 @@ the `editbootinstall` and `editbootconfig` custom scripts. selected bootloader the image build process will fail with an exception message. -name="grub2|systemd_boot|isolinux|grub2_s390x_emu": +name="grub2|systemd_boot|grub2_s390x_emu": Specifies the bootloader to use for this image. .. note:: systemd_boot ESP size @@ -1019,12 +1019,9 @@ attributes are supported: console="none|console|gfxterm|serial": Specifies the bootloader console. The attribute is available for the - `grub` and `isolinux` bootloader types. The behavior for setting up + `grub` bootloader type. The behavior for setting up the console is different per bootloader: - For `isolinux` the console setting is taken as provided, whereas - only the values `serial` and `console` are taken into account. - For `grub` the console setting is split into the setting for the output and the input console: