From 3bcd7a0f6acc930864d0c759a402ee533b5e2e2e Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Mon, 23 Jun 2014 18:35:57 +0200
Subject: [PATCH] Import patches-unapplied version 2.217 to
 ubuntu/utopic-proposed

Imported using git-ubuntu import.

Changelog parent: 42b125209273254cf40a99da04f11942a415580e

New changelog entries:
  * drop swapfile creation for preinstalled images
---
 debian/changelog       | 6 ++++++
 live-build/auto/config | 4 ----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0aec174d..33822903 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.217) utopic; urgency=medium
+
+  * drop swapfile creation for preinstalled images
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Mon, 23 Jun 2014 18:35:57 +0200
+
 livecd-rootfs (2.216) utopic; urgency=medium
 
   * ubuntu-touch: remove the previous ugly hack again ... issue is fixed
diff --git a/live-build/auto/config b/live-build/auto/config
index e8cf88fd..ef0ed203 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -112,8 +112,6 @@ case $IMAGEFORMAT in
 				;;
 			*)
 				add_package live jasper
-				OPTS="${OPTS:+$OPTS }--swap-file-path SWAP.swap"
-				OPTS="${OPTS:+$OPTS }--swap-file-size 512"
 				;;
 		esac
 		;;
@@ -309,8 +307,6 @@ case $PROJECT in
 		export LB_BOOTSTRAP_INCLUDE='apt-transport-https gnupg'
 		OPTS="${OPTS:+$OPTS }--apt-recommends false"
 		OPTS="${OPTS:+$OPTS }--compression gzip"
-		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"
 		;;