Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-15 21:01:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'codyshepherd/buildd/hide-grub-menu-ff' into ubuntu/focal

Browse Source
This commit is contained in:
Steve Langasek 2021-05-20 17:06:44 -07:00
commit b558c86764
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.664.22) UNRELEASED; urgency=medium
* Add grub config to produce console output and install lxd-agent loader
to allow buildd vm images to work in lxd without requirement for manual
installation (LP: #1915571)
-- Cody Shepherd <cody.shepherd@canonical.com> Mon, 01 Mar 2021 09:04:31 -0800
livecd-rootfs (2.664.21) focal; urgency=medium livecd-rootfs (2.664.21) focal; urgency=medium
[ Thomas Bechtold ] [ Thomas Bechtold ]

10
live-build/buildd/hooks/02-disk-image-uefi.binary
View File

@ -121,6 +121,16 @@ install_grub() {
chroot mountpoint grub-install --target=i386-pc "${loop_device}" chroot mountpoint grub-install --target=i386-pc "${loop_device}"
fi 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 divert_grub mountpoint
chroot mountpoint update-grub chroot mountpoint update-grub
replace_grub_root_with_label mountpoint replace_grub_root_with_label mountpoint

3
live-build/buildd/hooks/52-linux-virtual-image.binary
View File

@ -44,7 +44,8 @@ env DEBIAN_FRONTEND=noninteractive chroot "$mount_d" apt-get \
dist-upgrade --assume-yes dist-upgrade --assume-yes
env DEBIAN_FRONTEND=noninteractive chroot "$mount_d" apt-get \ env DEBIAN_FRONTEND=noninteractive chroot "$mount_d" apt-get \
install -y lsb-release locales initramfs-tools busybox-initramfs \ install -y lsb-release locales initramfs-tools busybox-initramfs \
udev dbus netplan.io cloud-init openssh-server sudo snapd udev dbus netplan.io cloud-init openssh-server sudo snapd \
lxd-agent-loader
# Install a kernel # Install a kernel
divert_grub "$mount_d" divert_grub "$mount_d"