From 66b87054e8155204fcaae4196f88592a07ee9457 Mon Sep 17 00:00:00 2001
From: Janne Grunau <janne-fdr@jannau.net>
Date: Sun, 27 Apr 2025 22:19:29 +0200
Subject: grub2: Enable `bls` for all non-live images

This became necessary with 10.0.13 / after merging
https://github.com/OSInside/kiwi/pull/2535 but doesn't seem to
noticeable effects besides miisin "GRUB_ENABLE_BLSCFG=true" in
/etc/default/grub.
---
 components/boot-eln.xml |  4 ++--
 components/boot.xml     |  6 +++---
 teams/cloud/cloud.xml   | 10 +++++-----
 teams/cloud/vagrant.xml |  4 ++--
 teams/eln/cloud.xml     | 10 +++++-----
 teams/scitech.xml       |  4 ++--
 teams/server.xml        | 14 +++++++-------
 7 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/components/boot-eln.xml b/components/boot-eln.xml
index f712c48..43d8b5c 100644
--- a/components/boot-eln.xml
+++ b/components/boot-eln.xml
@@ -13,7 +13,7 @@
 		      bootpartition="true" bootpartsize="1024" bootfilesystem="xfs" efipartsize="500" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" console="console" timeout="1" timeout_style="hidden"/>
+			<bootloader name="grub2" bls="true" console="console" timeout="1" timeout_style="hidden"/>
 			<oemconfig>
 				<oem-resize>false</oem-resize>
 			</oemconfig>
@@ -26,7 +26,7 @@
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" firmware="ofw"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" console="console" timeout="1" timeout_style="hidden"/>
+			<bootloader name="grub2" bls="true" console="console" timeout="1" timeout_style="hidden"/>
 			<oemconfig>
 				<oem-resize>false</oem-resize>
 			</oemconfig>
diff --git a/components/boot.xml b/components/boot.xml
index b7462ba..dcb5326 100644
--- a/components/boot.xml
+++ b/components/boot.xml
@@ -15,7 +15,7 @@
 		      bootpartition="true" bootpartsize="1024" bootfilesystem="ext4" efipartsize="500" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" console="console" timeout="5"/>
+			<bootloader name="grub2" bls="true" console="console" timeout="5"/>
 			<systemdisk name="fedora">
 				<volume name="@root=root"/>
 				<volume name="home" parent="/"/>
@@ -33,7 +33,7 @@
 		      bootpartition="true" bootpartsize="1024" bootfilesystem="ext4" efipartsize="500" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" console="console" timeout="5"/>
+			<bootloader name="grub2" bls="true" console="console" timeout="5"/>
 			<systemdisk name="fedora">
 				<volume name="@root=root"/>
 				<volume name="home" parent="/"/>
@@ -51,7 +51,7 @@
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" firmware="ofw"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" console="console" timeout="5"/>
+			<bootloader name="grub2" bls="true" console="console" timeout="5"/>
 			<systemdisk>
 				<volume name="@root=root"/>
 				<volume name="home" parent="/"/>
diff --git a/teams/cloud/cloud.xml b/teams/cloud/cloud.xml
index b6874c4..1bbd2c5 100644
--- a/teams/cloud/cloud.xml
+++ b/teams/cloud/cloud.xml
@@ -36,7 +36,7 @@
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" console="serial" timeout="0"/>
+			<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
 			<systemdisk>
 				<volume name="@root=root"/>
 				<volume name="home" parent="/"/>
@@ -56,7 +56,7 @@
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" timeout="0"/>
+			<bootloader name="grub2" bls="true" timeout="0"/>
 			<size unit="G">5</size>
 			<systemdisk>
 				<volume name="@root=root"/>
@@ -76,7 +76,7 @@
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" timeout="0"/>
+			<bootloader name="grub2" bls="true" timeout="0"/>
 			<!-- GCP engineers have told us the disk images have bad performance if they are anything less than 10G -->
 			<size unit="G">10</size>
 			<systemdisk>
@@ -97,7 +97,7 @@
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" console="serial" timeout="0"/>
+			<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
 			<size unit="G">5</size>
 			<systemdisk>
 				<volume name="@root=root"/>
@@ -117,7 +117,7 @@
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" firmware="ofw"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" console="serial" timeout="0"/>
+			<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
 			<size unit="G">5</size>
 			<systemdisk>
 				<volume name="@root=root"/>
diff --git a/teams/cloud/vagrant.xml b/teams/cloud/vagrant.xml
index 624f4ef..d25b163 100644
--- a/teams/cloud/vagrant.xml
+++ b/teams/cloud/vagrant.xml
@@ -18,7 +18,7 @@
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" console="serial" timeout="1"/>
+			<bootloader name="grub2" bls="true" console="serial" timeout="1"/>
 			<size unit="G">5</size>
 			<vagrantconfig provider="libvirt" virtualsize="5"/>
 			<systemdisk>
@@ -39,7 +39,7 @@
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" console="serial" timeout="1"/>
+			<bootloader name="grub2" bls="true" console="serial" timeout="1"/>
 			<size unit="G">5</size>
 			<vagrantconfig provider="virtualbox" virtualbox_guest_additions_present="true" virtualsize="5"/>
 			<systemdisk>
diff --git a/teams/eln/cloud.xml b/teams/eln/cloud.xml
index 1e15f5d..090b7b5 100644
--- a/teams/eln/cloud.xml
+++ b/teams/eln/cloud.xml
@@ -36,7 +36,7 @@
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" console="serial" timeout="0"/>
+			<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
 			<size unit="G">5</size>
 			<oemconfig>
 				<oem-resize>false</oem-resize>
@@ -51,7 +51,7 @@
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" timeout="0"/>
+			<bootloader name="grub2" bls="true" timeout="0"/>
 			<size unit="G">5</size>
 			<oemconfig>
 				<oem-resize>false</oem-resize>
@@ -66,7 +66,7 @@
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" timeout="0"/>
+			<bootloader name="grub2" bls="true" timeout="0"/>
 			<!-- GCP engineers have told us the disk images have bad performance if they are anything less than 10G -->
 			<size unit="G">10</size>
 			<oemconfig>
@@ -82,7 +82,7 @@
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" console="serial" timeout="0"/>
+			<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
 			<size unit="G">5</size>
 			<oemconfig>
 				<oem-resize>false</oem-resize>
@@ -97,7 +97,7 @@
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" firmware="ofw"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" console="serial" timeout="0"/>
+			<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
 			<size unit="G">5</size>
 			<oemconfig>
 				<oem-resize>false</oem-resize>
diff --git a/teams/scitech.xml b/teams/scitech.xml
index 631b8f3..831855f 100644
--- a/teams/scitech.xml
+++ b/teams/scitech.xml
@@ -31,7 +31,7 @@
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" console="serial" timeout="1"/>
+			<bootloader name="grub2" bls="true" console="serial" timeout="1"/>
 			<size unit="G">30</size>
 			<vagrantconfig provider="libvirt" virtualsize="30"/>
 			<systemdisk>
@@ -52,7 +52,7 @@
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" console="serial" timeout="1"/>
+			<bootloader name="grub2" bls="true" console="serial" timeout="1"/>
 			<size unit="G">30</size>
 			<vagrantconfig provider="virtualbox" virtualbox_guest_additions_present="true" virtualsize="30"/>
 			<systemdisk>
diff --git a/teams/server.xml b/teams/server.xml
index 0413e5a..25288c9 100644
--- a/teams/server.xml
+++ b/teams/server.xml
@@ -26,7 +26,7 @@
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="500" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" console="serial" timeout="0"/>
+			<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
 			<size unit="G">10</size>
 			<systemdisk>
 				<volume name="@root"/>
@@ -44,7 +44,7 @@
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" firmware="ofw"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" console="serial" timeout="0"/>
+			<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
 			<size unit="G">10</size>
 			<systemdisk>
 				<volume name="@root"/>
@@ -80,7 +80,7 @@
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="500" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" console="serial" timeout="0"/>
+			<bootloader name="grub2" bls="true" console="serial" timeout="0"/>
 			<size unit="G">10</size>
 			<systemdisk>
 				<volume name="@root"/>
@@ -97,7 +97,7 @@
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="500" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" console="serial" timeout="3" timeout_style="menu"/>
+			<bootloader name="grub2" bls="true" console="serial" timeout="3" timeout_style="menu"/>
 			<size unit="G">10</size>
 			<systemdisk>
 				<volume name="@root"/>
@@ -114,7 +114,7 @@
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="500" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" console="serial" timeout="3" timeout_style="menu"/>
+			<bootloader name="grub2" bls="true" console="serial" timeout="3" timeout_style="menu"/>
 			<size unit="G">10</size>
 			<systemdisk>
 				<volume name="@root"/>
@@ -131,7 +131,7 @@
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" firmware="ofw"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" console="serial" timeout="3" timeout_style="menu"/>
+			<bootloader name="grub2" bls="true" console="serial" timeout="3" timeout_style="menu"/>
 			<size unit="G">10</size>
 			<systemdisk>
 				<volume name="@root"/>
@@ -166,7 +166,7 @@
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="500" firmware="uefi"
 		      rootfs_label="fedora"
 		      >
-			<bootloader name="grub2" console="serial" timeout="3" timeout_style="menu"/>
+			<bootloader name="grub2" bls="true" console="serial" timeout="3" timeout_style="menu"/>
 			<size unit="G">10</size>
 			<systemdisk>
 				<volume name="@root"/>
-- 
cgit v1.3.1+13