[neon/neon/livecd-rootfs/Neon/release] live-build/ubuntu-cpc/hooks.d/base: riscv64: use efi=debug earlycon

[Heinrich Schuchardt]

Git commit 591b0a343227f6da84764b99480fab71dd20b317 by Heinrich Schuchardt.
Committed on 17/11/2022 at 10:21.
Pushed by jriddell into branch 'Neon/release'.

riscv64: use efi=debug earlycon

RISC-V boards tend to boot slowly.
We should provide progress information when booting.

Use 'efi=debug earlycon' on the Linux command line via new file
/etc/default/grub.d/cmdline.cfg.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt at canonical.com>

M  +4    -1    live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
A  +4    -0    live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/cmdline.cfg

https://invent.kde.org/neon/neon/livecd-rootfs/commit/591b0a343227f6da84764b99480fab71dd20b317

diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
index 0610e413..df8cb4af 100755
--- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
@@ -236,6 +236,10 @@ install_grub() {
             # TODO grub-efi-riscv64 exists, but is not used by all the images yet
             if [ -n "${SUBARCH:-}" ]; then
                 # Per-device images
+                local my_d=$(dirname $(readlink -f ${0}))
+                echo "Adjusting GRUB defaults for ${ARCH}"
+                mkdir -p mountpoint/etc/default/grub.d/
+                cp ${my_d}/riscv64/grub/cmdline.cfg mountpoint/etc/default/grub.d/
                 case "${SUBARCH}" in
                     "icicle")
                         echo "Installing GRUB for ${SUBARCH} board"
@@ -267,7 +271,6 @@ install_grub() {
                         chroot mountpoint rm -f /boot/boot.scr
                         ;;
                     "nezha"|"licheerv")
-                        local my_d=$(dirname $(readlink -f ${0}))
                         echo "Reducing initramfs size for ${SUBARCH} board"
                         mkdir -p mountpoint/etc/initramfs-tools/conf.d/
                         cp ${my_d}/riscv64/initramfs-tools/modules_list.conf mountpoint/etc/initramfs-tools/conf.d/
diff --git a/live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/cmdline.cfg b/live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/cmdline.cfg
new file mode 100644
index 00000000..c8cf57d0
--- /dev/null
+++ b/live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/cmdline.cfg
@@ -0,0 +1,4 @@
+# Booting on many riscv64 systems is slow. Let the user view progress.
+# For minimum output use
+# GRUB_CMDLINE_LINUX_DEFAULT="quiet"
+GRUB_CMDLINE_LINUX_DEFAULT="efi=debug earlycon"