Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kiwi-templates-Minimal for
openSUSE:Factory checked in at 2026-10-20 12:57:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi-templates-Minimal (Old)
and /work/SRC/openSUSE:Factory/.kiwi-templates-Minimal.new.3698736 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-templates-Minimal"
Tue Oct 20 12:57:24 2026 rev:45 rq:1386416 version:84.87.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/kiwi-templates-Minimal/kiwi-templates-Minimal.changes
2026-09-24 22:55:45.074926021 +0200
+++
/work/SRC/openSUSE:Factory/.kiwi-templates-Minimal.new.3698736/kiwi-templates-Minimal.changes
2026-10-20 12:57:42.071179058 +0200
@@ -1,0 +2,7 @@
+Fri Oct 9 14:20:58 UTC 2026 - Fabian Vogt <[email protected]>
+
+- Compatibility with KIWI 11:
+ * Set grub2 console to gfxterm explicitly where applicable
+ * Write /etc/sysconfig/bootloader for all platforms in config.sh
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Minimal.kiwi ++++++
--- /var/tmp/diff_new_pack.7xLUa5/_old 2026-10-20 12:57:43.067220766 +0200
+++ /var/tmp/diff_new_pack.7xLUa5/_new 2026-10-20 12:57:43.072220976 +0200
@@ -48,7 +48,7 @@
btrfs_root_is_snapshot="true"
bundle_format="%N-VM.%A-%M.%m.%p-%I"
>
- <bootloader name="grub2"/>
+ <bootloader name="grub2" output_console="gfxterm"/>
<systemdisk>
<volume name="home"/>
<volume name="root"/>
@@ -154,7 +154,7 @@
btrfs_root_is_snapshot="true"
bundle_format="%N-VM.%A-%M.%m.%p-%I"
>
- <bootloader name="grub2"/>
+ <bootloader name="grub2" output_console="gfxterm"/>
<systemdisk>
<volume name="home"/>
<volume name="root"/>
@@ -187,7 +187,7 @@
btrfs_root_is_snapshot="true"
bundle_format="%N-VM.%A-%M.%m.%p-%I"
>
- <bootloader name="grub2"/>
+ <bootloader name="grub2" output_console="gfxterm"/>
<systemdisk>
<volume name="home"/>
<volume name="root"/>
@@ -223,7 +223,7 @@
devicepersistency="by-uuid"
bundle_format="%N-VM.%A-%M.%m.%p-%I"
>
- <bootloader name="grub2" timeout="1"/>
+ <bootloader name="grub2" output_console="gfxterm" timeout="1"/>
<size unit="G">2</size>
</type>
</preferences>
@@ -250,7 +250,7 @@
<oem-resize>false</oem-resize>
</oemconfig>
<containerconfig name="opensuse/tumbleweed-kubevirt-minimal"
tag="latest"/>
- <bootloader name="grub2" timeout="1"/>
+ <bootloader name="grub2" output_console="gfxterm" timeout="1"/>
<size unit="G">2</size>
</type>
</preferences>
@@ -301,7 +301,7 @@
btrfs_root_is_snapshot="true"
bundle_format="%N-VM.%A-%M.%m.%p-%I"
>
- <bootloader name="grub2" timeout="10"/>
+ <bootloader name="grub2" output_console="gfxterm" timeout="10"/>
<systemdisk>
<volume name="home"/>
<volume name="root"/>
@@ -335,7 +335,7 @@
btrfs_root_is_snapshot="true"
bundle_format="%N-VM.%A-%M.%m.%p-%I"
>
- <bootloader name="grub2" timeout="10"/>
+ <bootloader name="grub2" output_console="gfxterm" timeout="10"/>
<systemdisk>
<volume name="home"/>
<volume name="root"/>
@@ -370,7 +370,7 @@
editbootinstall="editbootinstall_rpi.sh"
bundle_format="%N-Image.%A-%M.%m.%p-%I"
>
- <bootloader name="grub2"/>
+ <bootloader name="grub2" output_console="gfxterm"/>
<systemdisk>
<volume name="home"/>
<volume name="root"/>
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.7xLUa5/_old 2026-10-20 12:57:43.214226922 +0200
+++ /var/tmp/diff_new_pack.7xLUa5/_new 2026-10-20 12:57:43.218227089 +0200
@@ -120,6 +120,45 @@
chmod a+x /etc/fstab.script
#======================================
+# Determine and configure bootloader
+#--------------------------------------
+if [ -e /etc/sysconfig/bootloader ]; then
+ echo "Unexpected /etc/sysconfig/bootloader found"
+ exit 1
+fi
+
+loader_type=""
+if [ "$kiwi_bootloader" = "custom" ] && rpm -q sdbootutil; then
+ if rpm -q systemd-boot >/dev/null; then
+ loader_type="systemd-boot"
+ elif rpm -qa | grep 'grub2-.*-efi-bls' >/dev/null; then
+ loader_type="grub2-bls"
+ fi
+elif [ "$kiwi_bootloader" = "grub2_s390x_emu" ]; then
+ loader_type="grub2"
+elif [ "$kiwi_bootloader" = "grub2" ] ; then
+ if rpm -qa | grep 'grub2-.*-efi' >/dev/null; then
+ loader_type="grub2-efi"
+ elif rpm -q grub2-common >/dev/null; then
+ loader_type="grub2"
+ fi
+fi
+
+if [ -z "$loader_type" ]; then
+ echo "Unknown bootloader"
+ exit 1
+fi
+
+secure_boot="no"
+if rpm -q shim; then
+ secure_boot="yes"
+fi
+
+echo "LOADER_TYPE=\"${loader_type}\"" >> /etc/sysconfig/bootloader
+echo "SECURE_BOOT=\"${secure_boot}\"" >> /etc/sysconfig/bootloader
+# No need to set UPDATE_NVRAM="yes", it's already the default if applicable
+
+#======================================
# Add default kernel boot options
#--------------------------------------
consoles='console=ttyS0,115200 console=tty0'
++++++ disk.sh ++++++
--- /var/tmp/diff_new_pack.7xLUa5/_old 2026-10-20 12:57:43.250228429 +0200
+++ /var/tmp/diff_new_pack.7xLUa5/_new 2026-10-20 12:57:43.254228597 +0200
@@ -18,18 +18,6 @@
esac
echo "install boot loader"
- loader_type="grub2-bls"
- secure_boot="no"
- rpm -q systemd-boot && loader_type="systemd-boot"
- rpm -q shim && secure_boot="yes"
- if [ -s /etc/sysconfig/bootloader ]; then
- sed -i "s/^LOADER_TYPE=.*$/LOADER_TYPE=\"$loader_type\"/g"
/etc/sysconfig/bootloader
- sed -i "s/^SECURE_BOOT=.*$/SECURE_BOOT=\"$secure_boot\"/g"
/etc/sysconfig/bootloader
- else
- echo "LOADER_TYPE=\"${loader_type}\"" >>
/etc/sysconfig/bootloader
- echo "SECURE_BOOT=\"${secure_boot}\"" >>
/etc/sysconfig/bootloader
- fi
-
sdbootutil -v --no-random-seed --arch "$arch" --esp-path /boot/efi
--entry-token=auto --no-variables install
echo "add kernels"
