From d0d1c9c8ac250e92eca8d461a6db595b4ea4c9de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Mon, 20 Aug 2012 19:37:01 -0400 Subject: [PATCH] Import patches-unapplied version 2.74 to ubuntu/quantal Imported using git-ubuntu import. Changelog parent: 9715594952c049a6e4bb5fad59f99216647ebf2b New changelog entries: * Change mksquashfs compression flags for LTSP images, turning compression back on to match current ltsp-update-image behaviour. --- debian/changelog | 7 +++++++ livecd.sh | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 457bb640..9d30977c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.74) quantal; urgency=low + + * Change mksquashfs compression flags for LTSP images, turning + compression back on to match current ltsp-update-image behaviour. + + -- Stéphane Graber Mon, 20 Aug 2012 19:37:01 -0400 + livecd-rootfs (2.73) quantal; urgency=low * Add u-boot-tools to the installed set for all u-boot ARM images diff --git a/livecd.sh b/livecd.sh index de866f5a..2a66b0b8 100755 --- a/livecd.sh +++ b/livecd.sh @@ -813,7 +813,7 @@ Pin-Priority: 550 checkpoint "Building LTSP chroot" ltsp-build-client --base $(pwd) --mirror $MIRROR --arch $TARGETARCH --dist $STE --chroot ltsp-live --late-packages ldm-edubuntu-theme,plymouth-theme-edubuntu --purge-chroot --skipimage mkdir -p $(pwd)/images - mksquashfs $(pwd)/ltsp-live $(pwd)/images/ltsp-live.img -noF -noD -noI -no-exports -e cdrom + mksquashfs $(pwd)/ltsp-live $(pwd)/images/ltsp-live.img -e cdrom rm -Rf $(pwd)/ltsp-live if [ -f $(pwd)/images/ltsp-live.img ]; then mv $(pwd)/images/ltsp-live.img livecd.$FS-ltsp.squashfs