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.
This commit is contained in:
+3
-3
@@ -15,7 +15,7 @@
|
|||||||
bootpartition="true" bootpartsize="1024" bootfilesystem="ext4" efipartsize="500" firmware="uefi"
|
bootpartition="true" bootpartsize="1024" bootfilesystem="ext4" efipartsize="500" firmware="uefi"
|
||||||
rootfs_label="fedora"
|
rootfs_label="fedora"
|
||||||
>
|
>
|
||||||
<bootloader name="grub2" console="console" timeout="1" timeout_style="hidden"/>
|
<bootloader name="grub2" console="console" timeout="5"/>
|
||||||
<systemdisk name="fedora">
|
<systemdisk name="fedora">
|
||||||
<volume name="@root=root"/>
|
<volume name="@root=root"/>
|
||||||
<volume name="home" parent="/"/>
|
<volume name="home" parent="/"/>
|
||||||
@@ -33,7 +33,7 @@
|
|||||||
bootpartition="true" bootpartsize="1024" bootfilesystem="ext4" efipartsize="500" firmware="uefi"
|
bootpartition="true" bootpartsize="1024" bootfilesystem="ext4" efipartsize="500" firmware="uefi"
|
||||||
rootfs_label="fedora"
|
rootfs_label="fedora"
|
||||||
>
|
>
|
||||||
<bootloader name="grub2" console="console" timeout="1" timeout_style="hidden"/>
|
<bootloader name="grub2" console="console" timeout="5"/>
|
||||||
<systemdisk name="fedora">
|
<systemdisk name="fedora">
|
||||||
<volume name="@root=root"/>
|
<volume name="@root=root"/>
|
||||||
<volume name="home" parent="/"/>
|
<volume name="home" parent="/"/>
|
||||||
@@ -51,7 +51,7 @@
|
|||||||
bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" firmware="ofw"
|
bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" firmware="ofw"
|
||||||
rootfs_label="fedora"
|
rootfs_label="fedora"
|
||||||
>
|
>
|
||||||
<bootloader name="grub2" console="console" timeout="1" timeout_style="hidden"/>
|
<bootloader name="grub2" console="console" timeout="5"/>
|
||||||
<systemdisk>
|
<systemdisk>
|
||||||
<volume name="@root=root"/>
|
<volume name="@root=root"/>
|
||||||
<volume name="home" parent="/"/>
|
<volume name="home" parent="/"/>
|
||||||
|
|||||||
@@ -41,6 +41,10 @@ if [[ "$kiwi_profiles" != *"Container"* ]] && [[ "$kiwi_profiles" != *"FEX"* ]]
|
|||||||
echo "GRUB_DISABLE_SUBMENU=true" >> /etc/default/grub
|
echo "GRUB_DISABLE_SUBMENU=true" >> /etc/default/grub
|
||||||
## Disable recovery entries to match Fedora
|
## Disable recovery entries to match Fedora
|
||||||
echo "GRUB_DISABLE_RECOVERY=true" >> /etc/default/grub
|
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
|
fi
|
||||||
|
|
||||||
#======================================
|
#======================================
|
||||||
|
|||||||
Reference in New Issue
Block a user