diff --git a/debian/changelog b/debian/changelog index 22fa93c0..c2e474a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.525.54) 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.53) bionic; urgency=medium [ Thomas Bechtold ] 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