Marcus Schäfer
e17e03b63e
- Fixed targettype setup in zipl.conf The special targettype set to GPT still indicates SCSI for the zipl.conf but tells kiwi to create a GPT disk layout - Fixed s390 integration test targettype attribute in wrong section - Add support for GPT targettype on s390 Allow to build s390 images using GPT instead of the old DOS partition table. zipl has added support to read from GPT. This Fixes #2694 - Add --no-compress option to bundler Allow to skip the compression for bundle files marked to become compressed. This Fixes #2736 - Rawhide (F43) has removed basesystem package The basesystem package was retired with rawhide (F43). https://src.fedoraproject.org/rpms/filesystem/pull-request/20 - rawhide install shadow-utils for usermod Using `kiwi-ng` version 10.2.18 (EL9) Currently with: ``` sudo kiwi-ng system build \ --description kiwi/build-tests/x86/fedora/test-image-docker --set-repo http://ftp.fau.de/fedora/linux/development/rawhide/Everything/x86_64/os/ \ --target-dir /tmp/myimage1 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=287
63 lines
2.9 KiB
Diff
63 lines
2.9 KiB
Diff
restore backward compatibility for grub2 with bls.
|
|
For the time being, SUSE distributions cannot handle KIWI's
|
|
default (True) to use BLS with GRUB2. Until they catch up, the
|
|
kiwi default is set to: False
|
|
|
|
diff --git a/kiwi/xml_state.py b/kiwi/xml_state.py
|
|
index 7653be284..1e72cca22 100644
|
|
--- a/kiwi/xml_state.py
|
|
+++ b/kiwi/xml_state.py
|
|
@@ -1176,7 +1176,7 @@ class XMLState:
|
|
bootloader = self.get_build_type_bootloader_section()
|
|
if bootloader and bootloader.get_bls() is not None:
|
|
return bootloader.get_bls()
|
|
- return True
|
|
+ return False
|
|
|
|
def get_build_type_bootloader_console(self) -> List[str]:
|
|
"""
|
|
diff --git a/test/unit/bootloader/config/grub2_test.py b/test/unit/bootloader/config/grub2_test.py
|
|
index b40362941..a2dd3106d 100644
|
|
--- a/test/unit/bootloader/config/grub2_test.py
|
|
+++ b/test/unit/bootloader/config/grub2_test.py
|
|
@@ -629,7 +629,6 @@ class TestBootLoaderConfigGrub2:
|
|
'GRUB_BACKGROUND': '/boot/grub2/themes/openSUSE/background.png',
|
|
'GRUB_CMDLINE_LINUX_DEFAULT': '"some-cmdline"',
|
|
'GRUB_DISTRIBUTOR': '"Bob"',
|
|
- 'GRUB_ENABLE_BLSCFG': 'true',
|
|
'GRUB_ENABLE_CRYPTODISK': 'y',
|
|
'GRUB_GFXMODE': '800x600',
|
|
'GRUB_SERIAL_COMMAND': '"serial --speed=38400"',
|
|
@@ -677,7 +676,6 @@ class TestBootLoaderConfigGrub2:
|
|
'GRUB_BACKGROUND': '/boot/grub2/themes/openSUSE/background.png',
|
|
'GRUB_CMDLINE_LINUX_DEFAULT': '"some-cmdline"',
|
|
'GRUB_DISTRIBUTOR': '"Bob"',
|
|
- 'GRUB_ENABLE_BLSCFG': 'true',
|
|
'GRUB_ENABLE_CRYPTODISK': 'y',
|
|
'GRUB_GFXMODE': '800x600',
|
|
'GRUB_SERIAL_COMMAND': '"serial --speed=38400"',
|
|
@@ -720,7 +718,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'),
|
|
@@ -765,7 +762,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(
|
|
@@ -809,7 +805,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'),
|