From efa47e8566ebd4a32caa35a15c7ad50264f821ff Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 3 May 2013 11:46:58 -0700
Subject: [PATCH] Import patches-unapplied version 2.129 to
 ubuntu/saucy-proposed

Imported using git-ubuntu import.

Changelog parent: 69ac29ee57025565b5ee68c7a5e6a26763f88414

New changelog entries:
  * Disable zsync for ubuntu-touch images.
  * Copy binary-tar.tar.gz to $PREFIX.rootfs.tar.gz if it exists.
---
 debian/changelog       | 7 +++++++
 live-build/auto/build  | 2 ++
 live-build/auto/config | 1 +
 3 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8e1f1a51..d8e5465b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.129) saucy; urgency=low
+
+  * Disable zsync for ubuntu-touch images.
+  * Copy binary-tar.tar.gz to $PREFIX.rootfs.tar.gz if it exists.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 03 May 2013 11:46:58 -0700
+
 livecd-rootfs (2.128) saucy; urgency=low
 
   * Don't include lupin-casper in ubuntu-touch images.
diff --git a/live-build/auto/build b/live-build/auto/build
index 3cad7908..c6a068ba 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -301,6 +301,8 @@ if [ -e "binary/$INITFS/filesystem.dir" ]; then
 	(cd "binary/$INITFS/filesystem.dir/" && tar -c *) | \
 		gzip -9 --rsyncable > "$PREFIX.rootfs.tar.gz"
 	chmod 644 "$PREFIX.rootfs.tar.gz"
+elif [ -e binary-tar.tar.gz ]; then
+	cp -a binary-tar.tar.gz "$PREFIX.rootfs.tar.gz"
 fi
 
 # '--initramfs none' produces different manifest names.
diff --git a/live-build/auto/config b/live-build/auto/config
index b75c4ddc..6c37834a 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -277,6 +277,7 @@ case $PROJECT in
 		OPTS="${OPTS:+$OPTS }--swap-file-path SWAP.swap"
 		OPTS="${OPTS:+$OPTS }--swap-file-size 100"
 		OPTS="${OPTS:+$OPTS }--system normal"
+		OPTS="${OPTS:+$OPTS }--zsync false"
 		;;
 
 	*)