Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-23 11:21:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Adam Conrad 2019-10-13 23:16:48 -06:00
parent 35d16ae485
commit 7c85d91d41
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -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 <adconrad@ubuntu.com> 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

10
live-build/auto/config
View File

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