From b5a90a684928a817c5118b9ac9703ce750c5cc95 Mon Sep 17 00:00:00 2001
From: LaMont Jones <lamont@ubuntu.com>
Date: Fri, 26 Mar 2010 19:09:25 -0600
Subject: [PATCH] Import patches-unapplied version 1.111 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 17b0fc29a21d69ccfca49a3cc592000b4e6a2dc0

New changelog entries:
  * edubuntu-dvd/ltsp: mksquashfs needs the directory to exist
  * clean up comments
---
 .bzrignore       | 4 ++++
 debian/changelog | 7 +++++++
 livecd.sh        | 3 ++-
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 .bzrignore

diff --git a/.bzrignore b/.bzrignore
new file mode 100644
index 00000000..0c673e57
--- /dev/null
+++ b/.bzrignore
@@ -0,0 +1,4 @@
+debian/*.debhelper*
+debian/*.substvars
+debian/files
+debian/livecd-rootfs
diff --git a/debian/changelog b/debian/changelog
index c920071b..bf0a1f9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (1.111) lucid; urgency=low
+
+  * edubuntu-dvd/ltsp: mksquashfs needs the directory to exist
+  * clean up comments
+
+ -- LaMont Jones <lamont@ubuntu.com>  Fri, 26 Mar 2010 19:09:25 -0600
+
 livecd-rootfs (1.110) lucid; urgency=low
 
   * Add support for armel+omap, and remove incorrect comments from the armel
diff --git a/livecd.sh b/livecd.sh
index 89f99fc0..9898c6e9 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -21,7 +21,7 @@ set -eu
 # Boston, MA 02110-1301 USA.                                             #
 ##########################################################################
 
-# Depends: debootstrap, rsync, python-minimal|python, procps, squashfs-tools, ltsp-server
+# Depends: debootstrap, rsync, python-minimal|python, procps, squashfs-tools, ltsp-server [i386]
 
 cleanup() {
     for mnt in ${ROOT}dev/pts ${ROOT}dev/shm ${ROOT}.dev ${ROOT}dev \
@@ -653,6 +653,7 @@ Pin-Priority: 550
         edubuntu-dvd)
             if [ "$TARGETARCH" = "i386" ]; then
                 ltsp-build-client --base $(pwd) --mirror $MIRROR --arch $TARGETARCH --dist $STE --chroot ltsp-live --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
                 if [ -f $(pwd)/images/ltsp-live.img ]; then