From c257ebba9e05d42ebec8316c4a8929d3b963fca2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@ubuntu.com>
Date: Sun, 9 Sep 2012 15:49:07 -0400
Subject: [PATCH] Import patches-unapplied version 2.84 to ubuntu/quantal
Imported using git-ubuntu import.
Changelog parent: 8bc91f092fba1ec22fb41ade6e9283c9f0e7a69a
New changelog entries:
* Actually apply the change done in 2.74 as it was only done to the
legacy code...
- Change mksquashfs compression flags for LTSP images, turning
compression back on to match current ltsp-update-image behaviour.
---
debian/changelog | 9 +++++++++
live-build/auto/build | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 98e66b72..49e4a978 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+livecd-rootfs (2.84) quantal; urgency=low
+
+ * Actually apply the change done in 2.74 as it was only done to the
+ legacy code...
+ - Change mksquashfs compression flags for LTSP images, turning
+ compression back on to match current ltsp-update-image behaviour.
+
+ -- Stéphane Graber <stgraber@ubuntu.com> Sun, 09 Sep 2012 15:49:07 -0400
+
livecd-rootfs (2.83) quantal; urgency=low
* live-build/auto/config: Remove standard and server tasks from
diff --git a/live-build/auto/build b/live-build/auto/build
index 06268322..a87021f8 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -389,7 +389,7 @@ case $PROJECT in
echo "Building LTSP chroot"
ltsp-build-client --base $(pwd) --mirror $LB_PARENT_MIRROR_BOOTSTRAP --arch $ARCH --dist $LB_PARENT_DISTRIBUTION --chroot ltsp-live --late-packages ldm-edubuntu-theme,plymouth-theme-edubuntu --purge-chroot --skipimage
mkdir -p images
- mksquashfs ltsp-live images/ltsp-live.img -noF -noD -noI -no-exports -e cdrom
+ mksquashfs ltsp-live images/ltsp-live.img -e cdrom
rm -Rf ltsp-live
if [ -f images/ltsp-live.img ]; then
mv images/ltsp-live.img livecd.$PROJECT-ltsp.squashfs