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
This commit is contained in:
Oliver Grawert 2014-06-23 18:35:57 +02:00 committed by usd-importer
parent 42b1252092
commit 3bcd7a0f6a
2 changed files with 6 additions and 4 deletions

6
debian/changelog vendored
View File

@ -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

View File

@ -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"
;;