From ff11a427dc86e5a71fc8e3255fdfa84eb9750277 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Apr 27 2025 16:03:20 +0000 Subject: [PATCH 1/3] Stop setting GRUB_DEFAULT=saved after kiwi is fixed --- diff --git a/config.sh b/config.sh index 92e1072..6354276 100755 --- a/config.sh +++ b/config.sh @@ -36,9 +36,6 @@ rm -f /var/lib/systemd/random-seed #====================================== # Configure grub correctly #-------------------------------------- -## Works around issues with grub-bls -## See: https://github.com/OSInside/kiwi/issues/2198 -echo "GRUB_DEFAULT=saved" >> /etc/default/grub ## Disable submenus to match Fedora echo "GRUB_DISABLE_SUBMENU=true" >> /etc/default/grub ## Disable recovery entries to match Fedora From 2ad0b5ac8a673e0576ec444cf2dc7f13046bebec Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Apr 29 2025 21:04:48 +0000 Subject: [PATCH 2/3] *Desktop: Use the same grub2 config as Fedora anaconda installs The main part of this is setting `menu_auto_hide=1` in the grubenv file. This will result in a usually hidden menu with a 1 second timeout. It enables Fedora's boot success tracking and thus will display the menu after an unsuccessful boot and will revert to booting the previous kernel. This hopefully will result in less support effort after failed kernel updates as recovery will be more obvious. Change "GRUB_TIMEOUT" to 5 and omit "GRUB_TIMEOUT_STYLE" in /etc/default/grub to match Fedora Workstation installs. --- diff --git a/config.sh b/config.sh index 6354276..3da2ed8 100755 --- a/config.sh +++ b/config.sh @@ -44,6 +44,12 @@ echo "GRUB_DISABLE_RECOVERY=true" >> /etc/default/grub ## the native startup disk selection echo "GRUB_DISABLE_OS_PROBER=true" >> /etc/default/grub +if [[ "$kiwi_profiles" == *"-Desktop"* ]]; then + ## Enable menu_auto_hide to match Fedora anaconda installs + ## Set boot_success to avoid displaying the grub menu on first boot + grub2-editenv /boot/grub2/grubenv set menu_auto_hide=1 boot_success=1 +fi + #====================================== # Delete & lock the root user password #-------------------------------------- diff --git a/platforms/workstation.xml b/platforms/workstation.xml index dfb5798..59a75f5 100644 --- a/platforms/workstation.xml +++ b/platforms/workstation.xml @@ -15,7 +15,7 @@ - + From 01a781abac76e53a0f361c5382df92e76b0ecfe1 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Apr 29 2025 21:04:48 +0000 Subject: [PATCH 3/3] Enable grub2 BLS to match Fedora --- diff --git a/platforms/minimal.xml b/platforms/minimal.xml index 586a273..a651895 100644 --- a/platforms/minimal.xml +++ b/platforms/minimal.xml @@ -7,7 +7,7 @@ - + diff --git a/platforms/server.xml b/platforms/server.xml index c91c287..1764112 100644 --- a/platforms/server.xml +++ b/platforms/server.xml @@ -7,7 +7,7 @@ - + diff --git a/platforms/workstation.xml b/platforms/workstation.xml index 59a75f5..c289da3 100644 --- a/platforms/workstation.xml +++ b/platforms/workstation.xml @@ -15,7 +15,7 @@ - +