Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-07 17:02:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not create a hook manually for ubuntu-cpc builds, make-hooks does not like that.

Browse Source
This commit is contained in:
Michael Hudson-Doyle 2019-10-09 14:34:08 +13:00
parent 8caa938187
commit c89806ba4d
3 changed files with 18 additions and 6 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.618) UNRELEASED; urgency=medium
* Do not create a hook manually for ubuntu-cpc builds, make-hooks does not
like that.
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Wed, 09 Oct 2019 13:25:43 +1300
livecd-rootfs (2.617) eoan; urgency=medium livecd-rootfs (2.617) eoan; urgency=medium
* Create the lxd group as a system group for all projects. (LP: #1844498) * Create the lxd group as a system group for all projects. (LP: #1844498)

14
live-build/auto/config
View File

@ -988,17 +988,19 @@ echo "BUILDSTAMP=\"$NOW\"" >> config/binary
echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/binary echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/binary
echo "LB_DISTRIBUTION=\"$SUITE\"" >> config/binary echo "LB_DISTRIBUTION=\"$SUITE\"" >> config/binary
# We add the lxd group at image build time so that the default user if [ $PROJECT != ubuntu-cpc ]; then
# created by the installer or cloud-init is added to it (cloud-init # We add the lxd group at image build time so that the default user
# will create any group the user is configured to be added to, but as # created by the installer or cloud-init is added to it (cloud-init
# a normal group not a system group, see # will create any group the user is configured to be added to, but as
# https://bugs.launchpad.net/cloud-images/+bug/1844498). # a normal group not a system group, see
cat > config/hooks/100-add-lxd-group.chroot <<EOF # https://bugs.launchpad.net/cloud-images/+bug/1844498).
cat > config/hooks/100-add-lxd-group.chroot <<EOF
#!/bin/bash #!/bin/bash
echo "Adding lxd group..." echo "Adding lxd group..."
addgroup --system --quiet lxd addgroup --system --quiet lxd
EOF EOF
fi
case $ARCH+$SUBARCH in case $ARCH+$SUBARCH in
armhf+raspi2|armhf+raspi3|arm64+raspi3) armhf+raspi2|armhf+raspi3|arm64+raspi3)

3
live-build/ubuntu-cpc/hooks.d/chroot/025-create-groups.chroot
View File

@ -12,3 +12,6 @@ addgroup --system --quiet admin
echo "Adding netdev group..." echo "Adding netdev group..."
addgroup --system --quiet netdev addgroup --system --quiet netdev
echo "Adding lxd group..."
addgroup --system --quiet lxd