Merge lp:~jonathan/ubuntu/natty/livecd-rootfs/livecd-rootfs into lp:ubuntu/natty/livecd-rootfs

[Jonathan Carter]

The LiveCD build script has been updated to install the Edubuntu Plymouth and LDM themes in the LTSP chroot environment built for Edubuntu. debian/changelog has been updated accordingly, the package has not been uploaded yet (please sponsor if possible).

[Colin Watson (cjwatson)]

I can't merge this directly because it's branched from lp:ubuntu/livecd-rootfs rather than lp:livecd-rootfs, and the latter is where we actually work. I'll apply the same change to lp:livecd-rootfs, though. The substance of the change looks fine. Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-23 14:55:06 +0000
+++ debian/changelog	2011-03-01 16:23:26 +0000
@@ -1,3 +1,9 @@
+livecd-rootfs (1.160) natty; urgency=low
+
+  * Use Edubuntu theming for Edubuntu LTSP chroot 
+
+ -- Jonathan Carter <[e-mail]>  Tue, 01 Mar 2011 11:06:49 -0500
+
 livecd-rootfs (1.159) natty; urgency=low
 
   * create an empty swapfile on ext2/3 images by default, we care for use

=== modified file 'livecd.sh'
--- livecd.sh	2011-02-23 14:55:06 +0000
+++ livecd.sh	2011-03-01 16:23:26 +0000
@@ -796,7 +796,7 @@
         edubuntu-dvd)
             if [ "$TARGETARCH" = "i386" ]; then
                 checkpoint "Building LTSP chroot"
-                ltsp-build-client --base $(pwd) --mirror $MIRROR --arch $TARGETARCH --dist $STE --chroot ltsp-live --purge-chroot --skipimage
+                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
                 rm -Rf $(pwd)/ltsp-live