Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-08-16 11:14:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Imported 2.525.23

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2019-05-14 09:47:04 +00:00
parent 9774f43c56
commit 36bbe72b62
6 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
debian/changelog vendored
View File

@ -1,3 +1,20 @@
livecd-rootfs (2.525.23) bionic; urgency=medium
* Backport two minimizations for the docker images: remove apt lists that
are removed downstream anyway, and remove device nodes from the image.
(LP: #1828118)
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Wed, 08 May 2019 10:48:39 +1200
livecd-rootfs (2.525.22) bionic; urgency=medium
* Subiquity specific changes SRU LP: #1827357
- subiquity: make subiquity_config.mount optional
- Make serial-subiquity@ use the same codepath as tty1 subiquity.
- Fix ubuntu-server-live images to generate initrd with casper UUID.
-- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 02 May 2019 11:34:34 +0100
livecd-rootfs (2.525.21) bionic; urgency=medium
* Remove crufty files after minimize-manual (LP: #1826377)

11
live-build/auto/build
View File

@ -436,6 +436,17 @@ EOF
# remove crufty files that shouldn't be left in an image
rm -f chroot/var/cache/debconf/*-old chroot/var/lib/dpkg/*-old
Chroot chroot apt clean
# For the docker images we remove even more stuff.
if [ "${PROJECT}:${SUBPROJECT:-}" = "ubuntu-base:minimized" ]; then
# Remove apt lists (that are currently removed downstream
# anyway)
rm -rf chroot/var/lib/apt/lists/*
# Having device nodes in the docker image can cause problems
# (https://github.com/tianon/docker-brew-ubuntu-core/issues/62)
# so remove them. We only do this for docker out of an
# abundance of caution.
rm -rf chroot/dev/*
fi
lb binary "$@"
touch binary.success

1
live-build/ubuntu-server/hooks/032-installer-squashfs.binary
View File

@ -45,6 +45,7 @@ mkdir -p "$INSTALLER_ROOT/etc/systemd/system/$DEVICE_UNIT_NAME.d"
cat > "$INSTALLER_ROOT/etc/systemd/system/$DEVICE_UNIT_NAME.d/override.conf" <<EOF
[Unit]
JobRunningTimeoutSec=0s
Wants=subiquity_config.mount
EOF
# Prepare installer layer.

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

@ -55,7 +55,7 @@ for variant in $variants; do
if [ -n "$LB_INITRAMFS_COMPRESSION" ]; then
echo "COMPRESS=$LB_INITRAMFS_COMPRESSION" > "$KERNEL_BITS_ROOT"/etc/initramfs-tools/conf.d/livecd-rootfs.conf
fi
echo "CASPER_GENERATE_UUID=1" > "$KERNEL_BITS_ROOT"/etc/initramfs-tools/conf.d/casper.conf
echo "export CASPER_GENERATE_UUID=1" > "$KERNEL_BITS_ROOT"/etc/initramfs-tools/conf.d/casper.conf
# Add a hook to record which kernel was booted and mount the
# modules.squashfs created below.

1
live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/subiquity_config.mount
View File

@ -1 +0,0 @@
../subiquity_config.mount

4
live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service
View File

@ -7,9 +7,9 @@ ConditionPathExists=!/run/subiquity/complete
StartLimitInterval=0
[Service]
Environment=PYTHONPATH=/usr/share/subiquity
Environment=SNAP_REEXEC=0
ExecStartPre=/bin/systemctl stop serial-getty@%I
ExecStart=/sbin/agetty -n --keep-baud -l /snap/bin/subiquity --login-options "--serial" 115200,38400,9600 %I $TERM
ExecStart=/usr/bin/snap run subiquity.subiquity-service %I
ExecStopPost=/bin/systemctl start serial-getty@%I
Type=idle
Restart=always