From 21fa37c026e90f8565c83216222062907713b68d Mon Sep 17 00:00:00 2001
From: Steve Kowalik <stevenk@ubuntu.com>
Date: Thu, 27 Aug 2009 16:38:11 +1000
Subject: [PATCH] Add support for UMR.

---
 BuildLiveCD      |  2 +-
 debian/changelog |  6 ++++++
 livecd.sh        | 16 +++++++++++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/BuildLiveCD b/BuildLiveCD
index 4ef9048b..c318c048 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -85,7 +85,7 @@ esac
 
 for arg in "$@"; do
     case "$arg" in
-	*ubuntu|*ubuntu-dvd|kubuntu-netbook|ubuntu-lpia|ubuntu-mid|ubuntu-umpc|ubuntu-mobile|ubuntu-netbook-remix|mythbuntu|base|tocd)	;;
+	*ubuntu|*ubuntu-dvd|kubuntu-netbook|ubuntu-lpia|ubuntu-mid|ubuntu-umpc|ubuntu-mobile|ubuntu-netbook-remix|ubuntu-moblin-remix|mythbuntu|base|tocd)	;;
 	*)
 	    echo "bad project: $arg" >&2
 	    exit 2
diff --git a/debian/changelog b/debian/changelog
index 74a7f013..d7ddd611 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (0.94) UNRELEASED; urgency=low
+
+  * Add support for UMR.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Thu, 27 Aug 2009 16:36:51 +1000
+
 livecd-rootfs (0.93) karmic; urgency=low
 
   * remove temporary enablement of universe from the armel subarchitectures
diff --git a/livecd.sh b/livecd.sh
index d5c88d0d..4bb9f1eb 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -117,6 +117,7 @@ EXCLUDE=""
 LIST=""
 SUBARCH=""
 PROPOSED=""
+EXTRASOURCE=""
 
 while getopts :d:e:i:I:m:S:s:a:p name; do case $name in
     d)  STE=$OPTARG;;
@@ -142,7 +143,7 @@ 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-remix|base|tocd)
+       ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-netbook|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook-remix|ubuntu-moblin-remix|base|tocd)
 	    ;;
 	*)
 	    echo bad name >&2;
@@ -216,6 +217,12 @@ Flags: seen
 	    LIVELIST="mythbuntu-live^ laptop-detect casper lupin-casper"
 	    COMP="main restricted universe multiverse"
 	    ;;
+	ubuntu-moblin-remix)
+	    LIST="$LIST minimal^ ubuntu-moblin-remix"
+	    LIVELIST="casper lupin-casper"
+	    COMP="main restricted universe"
+	    EXTRASOURCE="http://ppa.launchpad.net/moblin/ppa/ubuntu/"
+	    ;;
 	base)
 	    LIST="$LIST minimal^ standard^"
 	    LIVELIST="casper lupin-casper"
@@ -362,7 +369,14 @@ Pin-Priority: 900
     if [ "$PROPOSED" = "yes" ]; then
         echo deb $MIRROR ${STE}-proposed ${COMP} >> ${ROOT}etc/apt/sources.list
     fi
+    if [ -n "$EXTRASOURCE" ]; then
+	echo deb $EXTRASOURCE $STE ${COMP} >> ${ROOT}etc/apt/sources.list
+    fi
     chroot $ROOT apt-get update
+    if [ "$FS" = "ubuntu-moblin-remix" ]; then
+	chroot $ROOT apt-get -y --force-yes install ubuntu-moblin-ppa-keyring
+	chroot $ROOT apt-get update
+    fi
     chroot $ROOT apt-get -y --purge dist-upgrade </dev/null
     chroot $ROOT apt-get -y --purge install $LIST </dev/null