Imported 2.626

No reason for CPC update specified.
impish
CloudBuilder 5 years ago
parent 2e7eb0d4bc
commit a379301c9a

15
debian/changelog vendored

@ -1,3 +1,18 @@
livecd-rootfs (2.626) focal; urgency=medium
* No-change rebuild to build for i386 again (for now).
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Thu, 28 Nov 2019 11:43:51 +1300
livecd-rootfs (2.625) focal; urgency=medium
* Make autoinstall files from initrd and filesystem with label autoinstall
available on live-server systems.
* Create a filelist whenever creating a manifest for an ubuntu-cpc
project.
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Thu, 28 Nov 2019 09:20:38 +1300
livecd-rootfs (2.624) focal; urgency=medium
* Mark packages as autoinstalled using apt-mark in the chroot

@ -51,6 +51,11 @@ create_manifest() {
echo "create_manifest call to dpkg-query finished."
./config/snap-seed-parse "${chroot_root}" "${target_file}"
echo "create_manifest call to snap_seed_parse finished."
if [ "$PROJECT" = ubuntu-cpc ]; then
echo "create_manifest creating file listing."
local target_filelist=${2%.manifest}.filelist
(cd "${chroot_root}" && find -xdev) > "${target_filelist}"
fi
echo "create_manifest finished"
}

@ -14,6 +14,7 @@ rootfs_dir=rootfs.dir
squashfs_f="$PWD/livecd.ubuntu-cpc.squashfs"
cp $rootfs_dir.manifest $squashfs_f.manifest
cp $rootfs_dir.filelist $squashfs_f.filelist
(cd $rootfs_dir &&
mksquashfs . $squashfs_f \

@ -12,4 +12,5 @@ fi
rootfs_dir=rootfs.dir
cp $rootfs_dir.manifest livecd.ubuntu-cpc.rootfs.manifest
cp $rootfs_dir.filelist livecd.ubuntu-cpc.rootfs.filelist
(cd $rootfs_dir/ && tar -c --sort=name --xattrs *) | xz > livecd.ubuntu-cpc.rootfs.tar.xz

@ -7,3 +7,4 @@ provides livecd.ubuntu-cpc.initrd-generic-lpae
provides livecd.ubuntu-cpc.kernel-generic
provides livecd.ubuntu-cpc.kernel-generic-lpae
provides livecd.ubuntu-cpc.manifest
provides livecd.ubuntu-cpc.filelist

@ -2,3 +2,4 @@ depends disk-image
base/kvm-image.binary
provides livecd.ubuntu-cpc.disk-kvm.img
provides livecd.ubuntu-cpc.disk-kvm.manifest
provides livecd.ubuntu-cpc.disk-kvm.filelist

@ -2,3 +2,4 @@ depends root-dir
base/root-squashfs.binary
provides livecd.ubuntu-cpc.squashfs
provides livecd.ubuntu-cpc.squashfs.manifest
provides livecd.ubuntu-cpc.squashfs.filelist

@ -2,3 +2,4 @@ depends root-dir
base/root-xz.binary
provides livecd.ubuntu-cpc.rootfs.tar.xz
provides livecd.ubuntu-cpc.rootfs.manifest
provides livecd.ubuntu-cpc.rootfs.filelist

@ -2,3 +2,4 @@ depends root-dir
base/wsl.binary
provides livecd.ubuntu-cpc.wsl.rootfs.tar.gz
provides livecd.ubuntu-cpc.wsl.rootfs.manifest
provides livecd.ubuntu-cpc.wsl.rootfs.filelist

@ -42,14 +42,22 @@ setup_mountpoint binary/boot/squashfs.dir
# to a new VT when there is no device there (LP: #1750117).
# It would be better to have this in ../includes.binary/overlay but
# you can't have backslashes in filenames in bzr branches!
DEVICE_UNIT_NAME='dev-disk-by\x2duuid-00c629d6\x2d06ab\x2d4dfd\x2db21e\x2dc3186f34105d.device'
mkdir -p "$INSTALLER_ROOT/etc/systemd/system/$DEVICE_UNIT_NAME.d"
cat > "$INSTALLER_ROOT/etc/systemd/system/$DEVICE_UNIT_NAME.d/override.conf" <<EOF
ANSWERS_DEVICE_UNIT='dev-disk-by\x2duuid-00c629d6\x2d06ab\x2d4dfd\x2db21e\x2dc3186f34105d.device'
mkdir -p "$INSTALLER_ROOT/etc/systemd/system/$ANSWERS_DEVICE_UNIT.d"
cat > "$INSTALLER_ROOT/etc/systemd/system/$ANSWERS_DEVICE_UNIT.d/override.conf" <<EOF
[Unit]
JobRunningTimeoutSec=0s
Wants=subiquity_config.mount
EOF
AUTOINSTALL_DEVICE_UNIT='dev-disk-by\x2dlabel-autoinstall.device'
mkdir -p "$INSTALLER_ROOT/etc/systemd/system/$AUTOINSTALL_DEVICE_UNIT.d"
cat > "$INSTALLER_ROOT/etc/systemd/system/$AUTOINSTALL_DEVICE_UNIT.d/override.conf" <<EOF
[Unit]
JobRunningTimeoutSec=0s
Wants=subiquity_autoinstall.mount
EOF
# Prepare installer layer.
# Install casper for live session magic.
@ -74,6 +82,18 @@ snap_preseed $INSTALLER_ROOT subiquity/classic
# Drop lxd from the installer layer preseed
sed -i -e'N;/name: lxd/,+2d' $INSTALLER_ROOT/var/lib/snapd/seed/seed.yaml
# Add initramfs hook to copy /autoinstall.yaml from initrd
# /run/initrd-autoinstall.yaml
cat <<EOF > "$INSTALLER_ROOT"/etc/initramfs-tools/scripts/init-bottom/copy-autoinstall
#!/bin/sh
case \$1 in
prereqs) exit 0;;
esac
[ -f /autoinstall.yaml ] && cp /autoinstall.yaml /run/initrd-autoinstall.yaml
EOF
chmod +x "$INSTALLER_ROOT"/etc/initramfs-tools/scripts/init-bottom/copy-autoinstall
teardown_mountpoint "$INSTALLER_ROOT"
squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs"

@ -0,0 +1,4 @@
[Mount]
What=/dev/disk/by-label/autoinstall
Where=/autoinstall
Type=ext4
Loading…
Cancel
Save