aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhasim Syed Mohammed <khasim.mohammed@arm.com>2021-05-25 19:59:50 +0530
committerKhasim Syed Mohammed <khasim.mohammed@arm.com>2021-05-27 17:54:46 +0530
commitffc76ae2feb68094eb51018e07cebfb3064017ed (patch)
tree748339eb1a3e6bfc8a4441b0ea45a447d356be9f
parent1ad4fa99b723213a6818a5862bc88f281de47599 (diff)
n1sdp: fix second Ubuntu boot stopping at GRUB consoleN1SDP-2021.05.26n1sdp-v2
apt-get install of grub-efi-arm64 on Ubuntu 18.04 is installing grub-efi-arm64 version 2.04 (earlier version 2.02 was getting installed) and this (2.04) version has many fixes for secure boot and this explicitly requires us to select between, --uefi-secure-boot (this is the default if signed file is available) --no-uefi-secure-boot And since we don't provide a signed file the GRUB enters the command shell. By providing --no-uefi-secure-boot with grub-install we ensure the grub is not looking for a signed file. This loads the appropriate .cfg file and boots the system. Signed-off-by: Khasim Syed Mohammed <khasim.mohammed@arm.com> Change-Id: I0d395caee72a26003bbde9ccd5e60b4ffa5db8a3
-rw-r--r--helpers/platforms/n1sdp/ubuntu/init2
1 files changed, 1 insertions, 1 deletions
diff --git a/helpers/platforms/n1sdp/ubuntu/init b/helpers/platforms/n1sdp/ubuntu/init
index bda7657..9fd768c 100644
--- a/helpers/platforms/n1sdp/ubuntu/init
+++ b/helpers/platforms/n1sdp/ubuntu/init
@@ -53,7 +53,7 @@ echo "LABEL=ESP /boot/efi vfat defaults 0 0" >> etc/fstab
mkdir /boot/efi
mount /boot/efi
mount -t efivarfs efivarfs /sys/firmware/efi/efivars/
-grub-install || true
+grub-install --no-uefi-secure-boot || true
[ -e /linux-image-n1sdp.deb ] && dpkg -i /linux-image-n1sdp.deb
[ -e /linux-headers-n1sdp.deb ] && dpkg -i /linux-headers-n1sdp.deb
sed -ie 's/^GRUB_TIMEOUT_STYLE=.*$/GRUB_TIMEOUT_STYLE=menu/; s/^GRUB_TIMEOUT=.*$/GRUB_TIMEOUT=2/; s/GRUB_CMDLINE_LINUX_DEFAULT=.*$/GRUB_CMDLINE_LINUX_DEFAULT="earlycon vfio-pci.ids=10ee:9038"/' /etc/default/grub