From 8cea9b682d29f6f32b226c4fbe648567e3734e19 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Fri, 25 Jun 2010 17:14:39 +0200
Subject: [PATCH] instead of special casing for only one arch, base jasper vs
 casper inclusion on the IMAGETYPE variable

---
 debian/changelog |  7 ++++++-
 livecd.sh        | 29 +++++++++++++++--------------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7f573d2f..315fed41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 livecd-rootfs (1.121) UNRELEASED; urgency=low
 
+  [ LaMont Jones ]
   * BuildLiveCD: only pass -f if we were told it, since older chroots don't
     support it.
 
- -- LaMont Jones <lamont@ubuntu.com>  Wed, 16 Jun 2010 16:44:24 -0600
+  [ Oliver Grawert ]
+  * instead of special casing for only one arch, base jasper vs casper
+    inclusion on the IMAGETYPE variable
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Fri, 25 Jun 2010 17:13:52 +0200
 
 livecd-rootfs (1.120) maverick; urgency=low
 
diff --git a/livecd.sh b/livecd.sh
index 48228049..4219fdc0 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -178,6 +178,12 @@ if (( $# == 0 )) || [ "X$1" = "Xall" ]; then
     fi
 fi
 
+if [ "$IMAGEFORMAT" = "ext2" ] || [ "$IMAGEFORMAT" = "ext3" ]; then
+       LIVE_BOOT_SCRIPTS="jasper"
+else
+       LIVE_BOOT_SCRIPTS="$LIVE_BOOT_SCRIPTS"
+fi
+
 for arg in "$@"; do
     case "$arg" in
        ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-netbook|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook|ubuntu-moblin-remix|base|tocd)
@@ -222,29 +228,29 @@ Flags: seen
     case "$FS" in
 	ubuntu|ubuntu-lpia|ubuntu-dvd)
 	    LIST="$LIST minimal^ standard^ ubuntu-desktop^"
-	    LIVELIST="ubuntu-live^ laptop-detect casper lupin-casper"
+	    LIVELIST="ubuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
 	    ;;
 	kubuntu|kubuntu-dvd)
 	    LIST="$LIST minimal^ standard^ kubuntu-desktop^"
-	    LIVELIST="kubuntu-live^ laptop-detect casper lupin-casper"
+	    LIVELIST="kubuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
 	    ;;
 	kubuntu-netbook)
 	    LIST="$LIST minimal^ standard^ kubuntu-netbook^"
-	    LIVELIST="language-support-en kubuntu-netbook-live^ laptop-detect casper lupin-casper"
+	    LIVELIST="language-support-en kubuntu-netbook-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
 	    ;;
 	edubuntu|edubuntu-dvd)
 	    LIST="$LIST minimal^ standard^ edubuntu-desktop-gnome^"
-	    LIVELIST="edubuntu-live^ laptop-detect casper lupin-casper"
+	    LIVELIST="edubuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
 	    COMP="main restricted universe"
 	    ;;
 	xubuntu)
 	    LIST="$LIST minimal^ standard^ xterm xubuntu-desktop^"
-	    LIVELIST="xubuntu-live^ laptop-detect casper lupin-casper"
+	    LIVELIST="xubuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
 	    COMP="main restricted universe multiverse"
 	    ;;
 	gobuntu)
 	    LIST="$LIST minimal^ standard^ gobuntu-desktop^"
-	    LIVELIST="gobuntu-live^ laptop-detect casper lupin-casper"
+	    LIVELIST="gobuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
 	    COMP="main"
 	    ;;
 	ubuntu-mid)
@@ -254,16 +260,11 @@ Flags: seen
 	    ;;
 	ubuntu-netbook)
 	    LIST="$LIST minimal^ standard^ ubuntu-netbook^"
-	    LIVELIST="netbook-live^ laptop-detect casper lupin-casper"
-		case $TARGETARCH+$SUBARCH in
-			armel+omap*)
-	    		LIVELIST="netbook-live^ laptop-detect jasper"
-				;;
-		esac
+	    LIVELIST="netbook-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
 	    ;;
 	mythbuntu)
 	    LIST="$LIST minimal^ standard^ mythbuntu-desktop^"
-	    LIVELIST="mythbuntu-live^ laptop-detect casper lupin-casper"
+	    LIVELIST="mythbuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
 	    COMP="main restricted universe multiverse"
 	    ;;
 	ubuntu-moblin-remix)
@@ -274,7 +275,7 @@ Flags: seen
 	    ;;
 	base)
 	    LIST="$LIST minimal^ standard^"
-	    LIVELIST="casper lupin-casper"
+	    LIVELIST="$LIVE_BOOT_SCRIPTS"
 	    ;;
 	tocd)
 	    LIST="$LIST minimal^ standard^"