Merge remote-tracking branch 'codyshepherd/buildd/hide-grub-menu-bb' into ubuntu/bionic

This commit is contained in:
Steve Langasek 2021-05-21 17:30:15 -07:00
commit aace616e19
2 changed files with 17 additions and 0 deletions

7
debian/changelog vendored
View File

@ -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 <cody.shepherd@canonical.com> Mon, 01 Mar 2021 09:07:01 -0800
livecd-rootfs (2.525.53) bionic; urgency=medium
[ Thomas Bechtold ]

View File

@ -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