config.sh: Fix grub2-editenv snippet to only run on non-Server/Cloud disks
This is only needed for disk images that aren't for cloud environments or server workloads.
This commit is contained in:
@@ -41,10 +41,12 @@ 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" == *"Disk"* ]]; then
|
||||||
## Set boot_indeterminate to avoid displaying the grub menu on first boot
|
## Write `menu_auto_hide=1` into grubenv to match Fedora anaconda installs
|
||||||
if [[ "$kiwi_profiles" != *"Server"* ]]; then
|
## Set boot_indeterminate to avoid displaying the grub menu on first boot
|
||||||
grub2-editenv /boot/grub2/grubenv set menu_auto_hide=1 boot_indeterminate=1
|
if [[ "$kiwi_profiles" != *"Server"* ]] || [[ "$kiwi_profiles" != *"Cloud"* ]]; then
|
||||||
|
grub2-editenv /boot/grub2/grubenv set menu_auto_hide=1 boot_indeterminate=1
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user