From 7c85d91d41c29a22c07e031a09ed62c4c4078583 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Sun, 13 Oct 2019 23:16:48 -0600 Subject: [PATCH] Limit the lxd group to images with an installer; it's less appropriate for random tarball images, which are configured in ways we don't know. --- debian/changelog | 7 +++++++ live-build/auto/config | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 71b3a582..f9d0a137 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.620) eoan; urgency=medium + + * Limit the lxd group to images with an installer; it's less appropriate + for random tarball images, which are configured in ways we don't know. + + -- Adam Conrad Sun, 13 Oct 2019 23:15:02 -0600 + livecd-rootfs (2.619) eoan; urgency=medium * Subiquity: install linux-firmware in the installer layer, to make diff --git a/live-build/auto/config b/live-build/auto/config index e99a63d4..8433bb4d 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -988,7 +988,12 @@ echo "BUILDSTAMP=\"$NOW\"" >> config/binary echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/binary echo "LB_DISTRIBUTION=\"$SUITE\"" >> config/binary -if [ $PROJECT != ubuntu-cpc ]; then +case $PROJECT in + ubuntu-cpc|ubuntu-core|ubuntu-base|base) + # ubuntu-cpc gets this added in 025-create-groups.chroot, and we do + # not want this group in projects that are effectively just chroots + ;; + *) # 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 @@ -1000,7 +1005,8 @@ if [ $PROJECT != ubuntu-cpc ]; then echo "Adding lxd group..." addgroup --system --quiet lxd EOF -fi + ;; +esac case $ARCH+$SUBARCH in armhf+raspi2|armhf+raspi3|arm64+raspi3)