diff -Nru livecd-rootfs-2.578.2/debian/changelog livecd-rootfs-2.578.4/debian/changelog --- livecd-rootfs-2.578.2/debian/changelog 2019-05-07 21:59:35.000000000 +0000 +++ livecd-rootfs-2.578.4/debian/changelog 2019-05-23 20:33:40.000000000 +0000 @@ -1,3 +1,18 @@ +livecd-rootfs (2.578.4) disco; urgency=medium + + [ Robert C Jennings ] + * magic-proxy: Send headers on error (LP: #1829944) + + -- Steve Langasek Thu, 23 May 2019 13:33:40 -0700 + +livecd-rootfs (2.578.3) disco; urgency=medium + + [ Robert C Jennings ] + * ubuntu-cpc: Ensure base disk image is the same between all build targets + (LP: #1827426) + + -- Steve Langasek Tue, 21 May 2019 15:19:34 -0700 + livecd-rootfs (2.578.2) disco; urgency=medium * Remove device nodes later for ubuntu-base:minimized (i.e. docker) builds. diff -Nru livecd-rootfs-2.578.2/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary livecd-rootfs-2.578.4/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary --- livecd-rootfs-2.578.2/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary 2019-05-07 21:59:35.000000000 +0000 +++ livecd-rootfs-2.578.4/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary 2019-05-23 04:15:57.000000000 +0000 @@ -65,8 +65,8 @@ chroot mountpoint mkdir -p "${efi_boot_dir}" if [ -n "$partuuid" ]; then - # FIXME: code duplicated between 032-disk-image.binary - # and 033-disk-image-uefi.binary. We want to fix this to not + # FIXME: code duplicated between disk-image.binary + # and disk-image-uefi.binary. We want to fix this to not # have initramfs-tools installed at all on these images. echo "partuuid found for root device; omitting initrd" echo "GRUB_FORCE_PARTUUID=$partuuid" >> mountpoint/etc/default/grub.d/40-force-partuuid.cfg diff -Nru livecd-rootfs-2.578.2/live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary livecd-rootfs-2.578.4/live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary --- livecd-rootfs-2.578.2/live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary 2019-05-07 21:59:35.000000000 +0000 +++ livecd-rootfs-2.578.4/live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary 2019-05-22 00:20:33.000000000 +0000 @@ -8,7 +8,7 @@ exit 0 fi -# This is the directory created by 031-0-create-root-dir.binary +# This is the directory created by create-root-dir.binary rootfs_dir=rootfs.dir squashfs_f="$PWD/livecd.ubuntu-cpc.squashfs" diff -Nru livecd-rootfs-2.578.2/live-build/ubuntu-cpc/hooks.d/base/root-xz.binary livecd-rootfs-2.578.4/live-build/ubuntu-cpc/hooks.d/base/root-xz.binary --- livecd-rootfs-2.578.2/live-build/ubuntu-cpc/hooks.d/base/root-xz.binary 2019-05-07 21:59:35.000000000 +0000 +++ livecd-rootfs-2.578.4/live-build/ubuntu-cpc/hooks.d/base/root-xz.binary 2019-05-23 04:15:57.000000000 +0000 @@ -8,7 +8,7 @@ exit 0 fi -# This is the directory created by 031-0-create-root-dir.binary +# This is the directory created by create-root-dir.binary rootfs_dir=rootfs.dir cp $rootfs_dir.manifest livecd.ubuntu-cpc.rootfs.manifest diff -Nru livecd-rootfs-2.578.2/live-build/ubuntu-cpc/hooks.d/base/series/root-dir livecd-rootfs-2.578.4/live-build/ubuntu-cpc/hooks.d/base/series/root-dir --- livecd-rootfs-2.578.2/live-build/ubuntu-cpc/hooks.d/base/series/root-dir 2019-05-07 21:59:35.000000000 +0000 +++ livecd-rootfs-2.578.4/live-build/ubuntu-cpc/hooks.d/base/series/root-dir 2019-05-22 00:20:33.000000000 +0000 @@ -1 +1,3 @@ +# Include disk-image to ensure livecd.ubuntu-cpc.ext4 is consistent +depends disk-image base/create-root-dir.binary diff -Nru livecd-rootfs-2.578.2/live-build/ubuntu-cpc/hooks.d/base/series/squashfs livecd-rootfs-2.578.4/live-build/ubuntu-cpc/hooks.d/base/series/squashfs --- livecd-rootfs-2.578.2/live-build/ubuntu-cpc/hooks.d/base/series/squashfs 2019-05-07 21:59:35.000000000 +0000 +++ livecd-rootfs-2.578.4/live-build/ubuntu-cpc/hooks.d/base/series/squashfs 2019-05-21 22:50:16.000000000 +0000 @@ -1,2 +1,4 @@ +# Include disk-image to ensure livecd.ubuntu-cpc.ext4 is consistent +depends disk-image depends root-dir base/root-squashfs.binary diff -Nru livecd-rootfs-2.578.2/live-build/ubuntu-cpc/hooks.d/base/series/tarball livecd-rootfs-2.578.4/live-build/ubuntu-cpc/hooks.d/base/series/tarball --- livecd-rootfs-2.578.2/live-build/ubuntu-cpc/hooks.d/base/series/tarball 2019-05-07 21:59:35.000000000 +0000 +++ livecd-rootfs-2.578.4/live-build/ubuntu-cpc/hooks.d/base/series/tarball 2019-05-21 22:50:16.000000000 +0000 @@ -1,2 +1,4 @@ +# Include disk-image to ensure livecd.ubuntu-cpc.ext4 is consistent +depends disk-image depends root-dir base/root-xz.binary diff -Nru livecd-rootfs-2.578.2/live-build/ubuntu-cpc/hooks.d/base/vmdk-ova-image.binary livecd-rootfs-2.578.4/live-build/ubuntu-cpc/hooks.d/base/vmdk-ova-image.binary --- livecd-rootfs-2.578.2/live-build/ubuntu-cpc/hooks.d/base/vmdk-ova-image.binary 2019-05-07 21:59:35.000000000 +0000 +++ livecd-rootfs-2.578.4/live-build/ubuntu-cpc/hooks.d/base/vmdk-ova-image.binary 2019-05-23 04:15:57.000000000 +0000 @@ -7,7 +7,7 @@ # and checksums. This step produces an OVA that is suitable for use with # Cloud's that support the OVF specification. # -# For this step, we re-use the VMDK's made in 040-vmdk-image.binary +# For this step, we re-use the VMDK's made in vmdk-image.binary case ${SUBPROJECT:-} in minimized) diff -Nru livecd-rootfs-2.578.2/live-build/ubuntu-cpc/hooks.d/make-hooks livecd-rootfs-2.578.4/live-build/ubuntu-cpc/hooks.d/make-hooks --- livecd-rootfs-2.578.2/live-build/ubuntu-cpc/hooks.d/make-hooks 2019-05-07 21:59:35.000000000 +0000 +++ livecd-rootfs-2.578.4/live-build/ubuntu-cpc/hooks.d/make-hooks 2019-05-21 22:50:16.000000000 +0000 @@ -161,7 +161,7 @@ with open(series_file, "r", encoding="utf-8") as fp: for line in fp: line = line.strip() - if not line: + if not line or line.startswith("#"): continue m = re.match(r"^\s*depends\s+(\S+.*)$", line) if m: diff -Nru livecd-rootfs-2.578.2/lp-in-release livecd-rootfs-2.578.4/lp-in-release --- livecd-rootfs-2.578.2/lp-in-release 2019-05-07 21:59:35.000000000 +0000 +++ livecd-rootfs-2.578.4/lp-in-release 2019-05-23 20:33:25.000000000 +0000 @@ -843,6 +843,7 @@ """Return an HTTP error status and a message in the response body.""" self.send_response(status) self.send_header("Content-Type", "text/plain; charset=utf-8") + self.end_headers() self.wfile.write(message.encode("utf-8")) diff -Nru livecd-rootfs-2.578.2/magic-proxy livecd-rootfs-2.578.4/magic-proxy --- livecd-rootfs-2.578.2/magic-proxy 2019-05-07 21:59:35.000000000 +0000 +++ livecd-rootfs-2.578.4/magic-proxy 2019-05-23 20:33:25.000000000 +0000 @@ -843,6 +843,7 @@ """Return an HTTP error status and a message in the response body.""" self.send_response(status) self.send_header("Content-Type", "text/plain; charset=utf-8") + self.end_headers() self.wfile.write(message.encode("utf-8"))