Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-11-04 10:54:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Imported 2.618

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2019-10-09 08:00:06 +00:00
parent 625978e012
commit 5930884cf4
4 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
debian/changelog vendored
View File

@ -1,3 +1,29 @@
livecd-rootfs (2.618) eoan; urgency=medium
[ Michael Hudson-Doyle ]
* Do not create a hook manually for ubuntu-cpc builds, make-hooks does not
like that.
-- Steve Langasek <steve.langasek@ubuntu.com> Tue, 08 Oct 2019 21:21:45 -0700
livecd-rootfs (2.617) eoan; urgency=medium
* Create the lxd group as a system group for all projects. (LP: #1844498)
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Wed, 09 Oct 2019 10:12:09 +1300
livecd-rootfs (2.616) eoan; urgency=medium
* Subiquity images mount /usr/lib/modules from a squashfs, which systemd
tries to unmount on shutdown, whilst they are still being in use. As
systemd-udevd kmod built-in's libkmod has modules.* files
memorymapped. This produces an warning on shutdown, flooding the
screen with messages as systemd switches to a more verbose
output. Specify LazyUnmount=yes on that mount, such that unmount call
succeeds without flooding the shutdown log.
-- Dimitri John Ledkov <xnox@ubuntu.com> Tue, 08 Oct 2019 19:05:01 +0100
livecd-rootfs (2.615) eoan; urgency=medium livecd-rootfs (2.615) eoan; urgency=medium
* magic-proxy: dump proxy log to stdout on failure * magic-proxy: dump proxy log to stdout on failure

14
live-build/auto/config
View File

@ -988,6 +988,20 @@ 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
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 case $ARCH+$SUBARCH in
armhf+raspi2|armhf+raspi3|arm64+raspi3) armhf+raspi2|armhf+raspi3|arm64+raspi3)
cat > config/hooks/01-firmware-directory.chroot_early <<EOF cat > config/hooks/01-firmware-directory.chroot_early <<EOF

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

7
live-build/ubuntu-server/hooks/033-kernel-bits.binary
View File

@ -67,8 +67,11 @@ prereqs) exit 0;;
esac esac
echo ${kernel_metapkg} > /run/kernel-meta-package echo ${kernel_metapkg} > /run/kernel-meta-package
mkdir -p \$rootmnt/lib/modules mkdir -p \$rootmnt/usr/lib/modules
mount \$rootmnt/cdrom/casper/extras/modules.squashfs-$flavor \$rootmnt/lib/modules mount \$rootmnt/cdrom/casper/extras/modules.squashfs-$flavor \$rootmnt/usr/lib/modules
mkdir -p /run/systemd/system/usr-lib-modules.mount.d
echo '[Mount]' >> /run/systemd/system/usr-lib-modules.mount.d/lazy.conf
echo 'LazyUnmount=yes' >> /run/systemd/system/usr-lib-modules.mount.d/lazy.conf
EOF EOF
chmod +x "$KERNEL_BITS_ROOT"/etc/initramfs-tools/scripts/init-bottom/live-server chmod +x "$KERNEL_BITS_ROOT"/etc/initramfs-tools/scripts/init-bottom/live-server