Import patches-unapplied version 2.41 to ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: bfc78e8dcde666b9a49b23706773a555cb958a6b

New changelog entries:
  * Re-enable swap on jasper-using images, a regression from
    the switch from livecd-rootfs to live-build (LP: #868662)
This commit is contained in:
Adam Conrad 2011-10-05 13:20:24 -06:00 committed by usd-importer
parent bfc78e8dcd
commit 3b110adb23
2 changed files with 9 additions and 0 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.41) oneiric; urgency=low
* Re-enable swap on jasper-using images, a regression from
the switch from livecd-rootfs to live-build (LP: #868662)
-- Adam Conrad <adconrad@ubuntu.com> Wed, 05 Oct 2011 13:20:24 -0600
livecd-rootfs (2.40) oneiric; urgency=low
* Revert the previous change and apply it for all $PREINSTALLED

View File

@ -78,6 +78,8 @@ case $IMAGEFORMAT in
;;
*)
add_package live jasper
OPTS="${OPTS:+$OPTS }--swap-file-path SWAP.swap"
OPTS="${OPTS:+$OPTS }--swap-file-size 512"
;;
esac
;;