From fb36bfecb64cc1dfdbdd7ddf51a8869176ff5fcb Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 30 Aug 2012 23:44:33 +0100 Subject: [PATCH] Import patches-unapplied version 2.81 to ubuntu/quantal Imported using git-ubuntu import. Changelog parent: 100814c6b76ef159f96c51a449652faa69dd3e3a New changelog entries: * live-build/auto/config: Disable zsync for BINARYFORMAT=iso*|usb* builds. --- debian/changelog | 6 ++++++ live-build/auto/config | 1 + 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index e0b4f8b3..59f33297 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.81) quantal; urgency=low + + * live-build/auto/config: Disable zsync for BINARYFORMAT=iso*|usb* builds. + + -- Colin Watson Thu, 30 Aug 2012 23:44:33 +0100 + livecd-rootfs (2.80) quantal; urgency=low * add pvr-omap4 driver to omap4 image builds for everything but diff --git a/live-build/auto/config b/live-build/auto/config index 53a45fc6..47947e6b 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -153,6 +153,7 @@ case $BINARYFORMAT in BINARY_IMAGES="$BINARYFORMAT" MEMTEST=memtest86+ BOOTLOADER=syslinux + OPTS="${OPTS:+$OPTS }--zsync=false" ;; esac