Imported 2.664.23

No reason for CPC update specified.
CloudBuilder 4 years ago
parent 6638aa1613
commit 345d6cef79

14
debian/changelog vendored

@ -1,3 +1,17 @@
livecd-rootfs (2.664.23) focal; urgency=medium
* Adding dependencies for Active Directory support (LP: #1921374)
-- Jean-Baptiste Lallement <jean-baptiste.lallement@ubuntu.com> Thu, 20 May 2021 17:52:20 +0200
livecd-rootfs (2.664.22) focal; 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> Thu, 20 May 2021 17:07:01 -0700
livecd-rootfs (2.664.21) focal; urgency=medium livecd-rootfs (2.664.21) focal; urgency=medium
[ Thomas Bechtold ] [ Thomas Bechtold ]

@ -1116,6 +1116,26 @@ EOF
;; ;;
esac esac
if [ $PROJECT = ubuntu ]; then
cat > config/hooks/001-active-directory.chroot <<EOF
#!/bin/sh
set -e
echo "I: Adding dependencies for Active Directory support (Workaround LP: #1921862)"
apt-get -y update
apt-get -y install sssd realmd adcli krb5-config
echo "I: Removing /var/lib/apt/lists/*"
find /var/lib/apt/lists/ -type f | xargs rm -f
echo "I: Removing /var/cache/apt/*.bin"
rm -f /var/cache/apt/*.bin/
EOF
fi
if [ $PROJECT = ubuntu-server ] && [ "${SUBPROJECT:-}" != live ]; then if [ $PROJECT = ubuntu-server ] && [ "${SUBPROJECT:-}" != live ]; then
cat > config/hooks/100-remove-fstab.chroot <<EOF cat > config/hooks/100-remove-fstab.chroot <<EOF
#! /bin/sh #! /bin/sh

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

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

Loading…
Cancel
Save