aboutsummaryrefslogtreecommitdiff
diff options
from:
to:
context:
space:
mode:
-rw-r--r--components/boot.xml6
-rwxr-xr-xconfig.sh4
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="/"/>
diff --git a/config.sh b/config.sh
index a5f2309..9b8c248 100755
--- a/config.sh
+++ b/config.sh
@@ -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
#======================================