From 205019dbdef9b6b1faa8748e562811f4a9f5ab9e Mon Sep 17 00:00:00 2001 From: Cody Shepherd Date: Wed, 10 Feb 2021 10:11:22 -0800 Subject: [PATCH 1/2] Set grub configs to hide boot menu and enable output on ttyS0 --- live-build/buildd/hooks/02-disk-image-uefi.binary | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/live-build/buildd/hooks/02-disk-image-uefi.binary b/live-build/buildd/hooks/02-disk-image-uefi.binary index f75e3aa2..8b84afd3 100755 --- a/live-build/buildd/hooks/02-disk-image-uefi.binary +++ b/live-build/buildd/hooks/02-disk-image-uefi.binary @@ -121,6 +121,16 @@ install_grub() { chroot mountpoint grub-install --target=i386-pc "${loop_device}" fi + cat > mountpoint/etc/default/grub.d/50-builddimg-settings.cfg << EOF +GRUB_DEFAULT=0 +GRUB_HIDDEN_TIMEOUT=0.1 +GRUB_HIDDEN_TIMEOUT_QUIET=true +GRUB_TIMEOUT=0.1 +GRUB_CMDLINE_LINUX_DEFAULT="console=ttyS0" +GRUB_RECORDFAIL_TIMEOUT=0 +GRUB_TERMINAL=console +EOF + divert_grub mountpoint chroot mountpoint update-grub replace_grub_root_with_label mountpoint From 42c5cafe90284a4304a8b21d425a53254757c3a6 Mon Sep 17 00:00:00 2001 From: Cody Shepherd Date: Mon, 1 Mar 2021 09:08:08 -0800 Subject: [PATCH 2/2] Update changelog --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 03957fd8..6664c9bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.525.52) UNRELEASED; urgency=medium + + * Add grub config to produce console output to allow buildd vm images to + produce console output in lxd vms (LP: #1915571) + + -- Cody Shepherd Mon, 01 Mar 2021 09:07:01 -0800 + livecd-rootfs (2.525.51) bionic; urgency=medium [ David Krauser ]