From 5930884cf4a432bed8cc2993737190595159dde1 Mon Sep 17 00:00:00 2001
From: CloudBuilder <cloud-image-builders@lists.canonical.com>
Date: Wed, 9 Oct 2019 08:00:06 +0000
Subject: [PATCH] Imported 2.618

No reason for CPC update specified.
---
 debian/changelog                              | 26 +++++++++++++++++++
 live-build/auto/config                        | 14 ++++++++++
 .../hooks.d/chroot/025-create-groups.chroot   |  3 +++
 .../hooks/033-kernel-bits.binary              |  7 +++--
 4 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1f5c4d38..7f943c6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+livecd-rootfs (2.618) eoan; urgency=medium
+
+  [ Michael Hudson-Doyle ]
+  * Do not create a hook manually for ubuntu-cpc builds, make-hooks does not
+    like that.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 08 Oct 2019 21:21:45 -0700
+
+livecd-rootfs (2.617) eoan; urgency=medium
+
+  * Create the lxd group as a system group for all projects. (LP: #1844498)
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Wed, 09 Oct 2019 10:12:09 +1300
+
+livecd-rootfs (2.616) eoan; urgency=medium
+
+  * Subiquity images mount /usr/lib/modules from a squashfs, which systemd
+    tries to unmount on shutdown, whilst they are still being in use. As
+    systemd-udevd kmod built-in's libkmod has modules.* files
+    memorymapped. This produces an warning on shutdown, flooding the
+    screen with messages as systemd switches to a more verbose
+    output. Specify LazyUnmount=yes on that mount, such that unmount call
+    succeeds without flooding the shutdown log.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 08 Oct 2019 19:05:01 +0100
+
 livecd-rootfs (2.615) eoan; urgency=medium
 
   * magic-proxy: dump proxy log to stdout on failure
diff --git a/live-build/auto/config b/live-build/auto/config
index 8addfd7b..e99a63d4 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -988,6 +988,20 @@ echo "BUILDSTAMP=\"$NOW\"" >> config/binary
 echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/binary
 echo "LB_DISTRIBUTION=\"$SUITE\"" >> config/binary
 
+if [ $PROJECT != ubuntu-cpc ]; then
+    # We add the lxd group at image build time so that the default user
+    # created by the installer or cloud-init is added to it (cloud-init
+    # will create any group the user is configured to be added to, but as
+    # a normal group not a system group, see
+    # https://bugs.launchpad.net/cloud-images/+bug/1844498).
+    cat > config/hooks/100-add-lxd-group.chroot <<EOF
+#!/bin/bash
+
+echo "Adding lxd group..."
+addgroup --system --quiet lxd
+EOF
+fi
+
 case $ARCH+$SUBARCH in
 	armhf+raspi2|armhf+raspi3|arm64+raspi3)
 		cat > config/hooks/01-firmware-directory.chroot_early <<EOF
diff --git a/live-build/ubuntu-cpc/hooks.d/chroot/025-create-groups.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/025-create-groups.chroot
index 031cbfef..3b409957 100755
--- a/live-build/ubuntu-cpc/hooks.d/chroot/025-create-groups.chroot
+++ b/live-build/ubuntu-cpc/hooks.d/chroot/025-create-groups.chroot
@@ -12,3 +12,6 @@ addgroup --system --quiet admin
 
 echo "Adding netdev group..."
 addgroup --system --quiet netdev
+
+echo "Adding lxd group..."
+addgroup --system --quiet lxd
diff --git a/live-build/ubuntu-server/hooks/033-kernel-bits.binary b/live-build/ubuntu-server/hooks/033-kernel-bits.binary
index 3506126e..4f7f9b95 100755
--- a/live-build/ubuntu-server/hooks/033-kernel-bits.binary
+++ b/live-build/ubuntu-server/hooks/033-kernel-bits.binary
@@ -67,8 +67,11 @@ prereqs) exit 0;;
 esac
 
 echo ${kernel_metapkg} > /run/kernel-meta-package
-mkdir -p \$rootmnt/lib/modules
-mount \$rootmnt/cdrom/casper/extras/modules.squashfs-$flavor \$rootmnt/lib/modules
+mkdir -p \$rootmnt/usr/lib/modules
+mount \$rootmnt/cdrom/casper/extras/modules.squashfs-$flavor \$rootmnt/usr/lib/modules
+mkdir -p /run/systemd/system/usr-lib-modules.mount.d
+echo '[Mount]' >> /run/systemd/system/usr-lib-modules.mount.d/lazy.conf
+echo 'LazyUnmount=yes' >> /run/systemd/system/usr-lib-modules.mount.d/lazy.conf
 EOF
 	chmod +x "$KERNEL_BITS_ROOT"/etc/initramfs-tools/scripts/init-bottom/live-server