From a379301c9aa54d8966790a5f0ba4a0f8b21c481f Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Thu, 28 Nov 2019 04:18:20 +0000 Subject: [PATCH] Imported 2.626 No reason for CPC update specified. --- debian/changelog | 15 +++++++++++ live-build/functions | 5 ++++ .../hooks.d/base/root-squashfs.binary | 1 + .../ubuntu-cpc/hooks.d/base/root-xz.binary | 1 + .../ubuntu-cpc/hooks.d/base/series/disk-image | 1 + live-build/ubuntu-cpc/hooks.d/base/series/kvm | 1 + .../ubuntu-cpc/hooks.d/base/series/squashfs | 1 + .../ubuntu-cpc/hooks.d/base/series/tarball | 1 + live-build/ubuntu-cpc/hooks.d/base/series/wsl | 1 + .../hooks/032-installer-squashfs.binary | 26 ++++++++++++++++--- .../system/subiquity_autoinstall.mount | 4 +++ 11 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/subiquity_autoinstall.mount diff --git a/debian/changelog b/debian/changelog index 8c840cb2..22c23208 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +livecd-rootfs (2.626) focal; urgency=medium + + * No-change rebuild to build for i386 again (for now). + + -- Michael Hudson-Doyle 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 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 diff --git a/live-build/functions b/live-build/functions index c5a63444..8092f3a4 100644 --- a/live-build/functions +++ b/live-build/functions @@ -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" } diff --git a/live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary b/live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary index eb2b5318..873cee59 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary @@ -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 \ diff --git a/live-build/ubuntu-cpc/hooks.d/base/root-xz.binary b/live-build/ubuntu-cpc/hooks.d/base/root-xz.binary index 609538ad..c8aad906 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/root-xz.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/root-xz.binary @@ -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 diff --git a/live-build/ubuntu-cpc/hooks.d/base/series/disk-image b/live-build/ubuntu-cpc/hooks.d/base/series/disk-image index 6cd49b54..fa13c6f1 100644 --- a/live-build/ubuntu-cpc/hooks.d/base/series/disk-image +++ b/live-build/ubuntu-cpc/hooks.d/base/series/disk-image @@ -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 diff --git a/live-build/ubuntu-cpc/hooks.d/base/series/kvm b/live-build/ubuntu-cpc/hooks.d/base/series/kvm index 556ca8dd..7e560c31 100644 --- a/live-build/ubuntu-cpc/hooks.d/base/series/kvm +++ b/live-build/ubuntu-cpc/hooks.d/base/series/kvm @@ -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 diff --git a/live-build/ubuntu-cpc/hooks.d/base/series/squashfs b/live-build/ubuntu-cpc/hooks.d/base/series/squashfs index 560fd79b..b9f0d8db 100644 --- a/live-build/ubuntu-cpc/hooks.d/base/series/squashfs +++ b/live-build/ubuntu-cpc/hooks.d/base/series/squashfs @@ -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 diff --git a/live-build/ubuntu-cpc/hooks.d/base/series/tarball b/live-build/ubuntu-cpc/hooks.d/base/series/tarball index c741c483..8e2bc766 100644 --- a/live-build/ubuntu-cpc/hooks.d/base/series/tarball +++ b/live-build/ubuntu-cpc/hooks.d/base/series/tarball @@ -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 diff --git a/live-build/ubuntu-cpc/hooks.d/base/series/wsl b/live-build/ubuntu-cpc/hooks.d/base/series/wsl index b082f4e4..749b48ba 100644 --- a/live-build/ubuntu-cpc/hooks.d/base/series/wsl +++ b/live-build/ubuntu-cpc/hooks.d/base/series/wsl @@ -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 diff --git a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary index 957eb4cb..7a5debe6 100755 --- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary +++ b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary @@ -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" < "$INSTALLER_ROOT/etc/systemd/system/$ANSWERS_DEVICE_UNIT.d/override.conf" < "$INSTALLER_ROOT/etc/systemd/system/$AUTOINSTALL_DEVICE_UNIT.d/override.conf" < "$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" diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/subiquity_autoinstall.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/subiquity_autoinstall.mount new file mode 100644 index 00000000..ae45838e --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/subiquity_autoinstall.mount @@ -0,0 +1,4 @@ +[Mount] +What=/dev/disk/by-label/autoinstall +Where=/autoinstall +Type=ext4