From cb683e30d2e2eae3b000fa2fa29db436ce91073a Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Tue, 20 Apr 2010 13:20:10 +0200
Subject: [PATCH] Import patches-unapplied version 1.114 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: d0c869bbc1ec928681c9b64dc3d8aac5d0339de6

New changelog entries:
  * make sure STRIP_VMLINUZ=no is set for omap, also change the code to only
    use the case statement for matching subarches instead of adding an extra
    check.
  * fix the comment for STRIP_VMLINUZ to reflect reality.
  * fix typo
---
 .bzrignore       |  4 ----
 debian/changelog | 15 +++++++++++++++
 livecd.sh        | 22 +++++++++++-----------
 3 files changed, 26 insertions(+), 15 deletions(-)
 delete mode 100644 .bzrignore

diff --git a/.bzrignore b/.bzrignore
deleted file mode 100644
index 0c673e57..00000000
--- a/.bzrignore
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/*.debhelper*
-debian/*.substvars
-debian/files
-debian/livecd-rootfs
diff --git a/debian/changelog b/debian/changelog
index d28c7422..f91f5d17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+livecd-rootfs (1.114) lucid; urgency=low
+
+  * make sure STRIP_VMLINUZ=no is set for omap, also change the code to only
+    use the case statement for matching subarches instead of adding an extra
+    check.
+  * fix the comment for STRIP_VMLINUZ to reflect reality.
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Tue, 20 Apr 2010 13:20:10 +0200
+
+livecd-rootfs (1.113) lucid; urgency=low
+
+  * fix typo
+
+ -- LaMont Jones <lamont@ubuntu.com>  Sat, 27 Mar 2010 21:10:16 -0600
+
 livecd-rootfs (1.112) lucid; urgency=low
 
   * ltsp image needs to be readable
diff --git a/livecd.sh b/livecd.sh
index 57197fcf..4a4b9d1b 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -316,6 +316,14 @@ link_in_boot = $link_in_boot
     mkdir -p ${ROOT}proc
     mount -tproc none ${ROOT}proc
 
+    # this indicates whether or not to keep /boot/vmlinuz; the default is to
+    # strip it from the livefs as ubiquity >= 1.9.4 copies the kernel from the
+    # CD root (/casper/vmlinuz) to the target if it doesn't find one on the
+    # livefs, allowing us to save space; however some subarches use the uImage
+    # format in casper/ so we would end up with no vmlinuz file in /boot at the
+    # end. Not stripping it in the first place from /boot saves us from that.
+    STRIP_VMLINUZ=yes
+
     case $TARGETARCH+$SUBARCH in
 	powerpc+ps3)
 	    mkdir -p ${ROOT}spu;;
@@ -338,24 +346,16 @@ link_in_boot = $link_in_boot
 					;;
 				dove)
 					LIST="$LIST linux-dove"
+					STRIP_VMLINUZ=no
 					;;
 				omap)
 					LIST="$LIST linux-omap"
+					STRIP_VMLINUZ=no
 					;;
 			esac;;
 	*)		echo "Unknown architecture: no kernel."; exit 1;;
     esac
 
-    # this indicates whether or not to keep /boot/vmlinuz; the default is to
-    # strip it from the livefs as ubiquity >= 1.9.4 copies the kernel from the
-    # CD root (/casper/vmlinuz) to the target if it doesn't find one on the
-    # livefs, allowing us to save space; however some subarches use the uImage
-    # format and wouldn't save any space so the stripping doesn't make sense
-    STRIP_VMLINUZ=yes
-    if [ "$TARGETARCH" = "armel" ] && [ "$SUBARCH" = "dove" ]; then
-        STRIP_VMLINUZ=no
-    fi
-
     for x in $EXCLUDE; do
 	LIST="$(without_package "$x" "$LIST")"
     done
@@ -658,7 +658,7 @@ Pin-Priority: 550
                 rm -Rf $(pwd)/ltsp-live
                 if [ -f $(pwd)/images/ltsp-live.img ]; then
                     mv $(pwd)/images/ltsp-live.img livecd.$FS-ltsp.squashfs
-                    chmod 644 livecd.$FS-ltsp.squashfs
+                    chmod 0644 livecd.$FS-ltsp.squashfs
                     rmdir --ignore-fail-on-non-empty $(pwd)/images/
                 else
                     echo "LTSP: Unable to build the chroot, see above for details."