mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-03-11 19:31:18 +00:00
Do not create a hook manually for ubuntu-cpc builds, make-hooks does not like that.
This commit is contained in:
parent
8caa938187
commit
c89806ba4d
7
debian/changelog
vendored
7
debian/changelog
vendored
@ -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
|
||||
|
||||
* Create the lxd group as a system group for all projects. (LP: #1844498)
|
||||
|
@ -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 <<EOF
|
||||
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)
|
||||
|
@ -12,3 +12,6 @@ addgroup --system --quiet admin
|
||||
|
||||
echo "Adding netdev group..."
|
||||
addgroup --system --quiet netdev
|
||||
|
||||
echo "Adding lxd group..."
|
||||
addgroup --system --quiet lxd
|
||||
|
Loading…
x
Reference in New Issue
Block a user