diff options
| author |  Janne Grunau <janne-fdr@jannau.net>
| 2025-04-27 21:49:19 +0200 |
|---|---|---|
| committer | Janne Grunau <janne-fdr@jannau.net>
| 2025-04-27 22:04:22 +0200 |
| commit | 61f0794ad5a1d4f8d067e753a4f2f3ae656b6d8e (patch) | |
| tree | 934176acc37fb72113310b9937ffe79c432d0cdc | |
| parent | 13c5d722ad8a6141ad58c4c0d19e4fb7ce63265c (diff) | |
| download | kiwi-descriptions-61f0794ad5a1d4f8d067e753a4f2f3ae656b6d8e.tar.gz kiwi-descriptions-61f0794ad5a1d4f8d067e753a4f2f3ae656b6d8e.zip | |
grub2: Use `menu_auto_hide=1` to match anaconda
menu_auto_hide=1 is required for the boot_success provided by Fedora's
grub2 package. This will fall back to the previous kernel and show the
usually hidden grub menu when booting fails.
This makes it unnecessary to override the timeout_style and using a
reduced timeout of 1 second for disk images.
| -rw-r--r-- | components/boot.xml | 6 | ||||
| -rwxr-xr-x | config.sh | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/components/boot.xml b/components/boot.xml index 0d59f5e..b7462ba 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="1" timeout_style="hidden"/> + <bootloader name="grub2" 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="1" timeout_style="hidden"/> + <bootloader name="grub2" 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="1" timeout_style="hidden"/> + <bootloader name="grub2" console="console" timeout="5"/> <systemdisk> <volume name="@root=root"/> <volume name="home" parent="/"/> @@ -41,6 +41,10 @@ if [[ "$kiwi_profiles" != *"Container"* ]] && [[ "$kiwi_profiles" != *"FEX"* ]] echo "GRUB_DISABLE_SUBMENU=true" >> /etc/default/grub ## Disable recovery entries to match Fedora echo "GRUB_DISABLE_RECOVERY=true" >> /etc/default/grub + ## Write `menu_auto_hide=1` into grubenv to match Fedora anaconda installs + if [["$kiwi_profiles" != *"Server"* ]]; then + grub2-editenv /boot/grub2/grubenv set menu_auto_hide=1 + fi fi #====================================== |