From c89806ba4d08e62301dec0f7aed422725a863986 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 9 Oct 2019 14:34:08 +1300 Subject: [PATCH] Do not create a hook manually for ubuntu-cpc builds, make-hooks does not like that. --- debian/changelog | 7 +++++++ live-build/auto/config | 14 ++++++++------ .../hooks.d/chroot/025-create-groups.chroot | 3 +++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 73cae3d3..e0d00eac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.618) UNRELEASED; urgency=medium + + * Do not create a hook manually for ubuntu-cpc builds, make-hooks does not + like that. + + -- Michael Hudson-Doyle Wed, 09 Oct 2019 13:25:43 +1300 + livecd-rootfs (2.617) eoan; urgency=medium * Create the lxd group as a system group for all projects. (LP: #1844498) diff --git a/live-build/auto/config b/live-build/auto/config index fccd923f..e99a63d4 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -988,17 +988,19 @@ echo "BUILDSTAMP=\"$NOW\"" >> config/binary echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/binary echo "LB_DISTRIBUTION=\"$SUITE\"" >> config/binary -# 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 < config/hooks/100-add-lxd-group.chroot <