Import patches-unapplied version 1.155 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: 9cca53267f

New changelog entries:
  * Add headless image type for armel minimal developer image building,
    same as base now, but may be modified later.
  * Disable running of flash-kernel on armel as it breaks the script when
    there is no boot partition available to update.

debian/changelog

@@ -1,3 +1,12 @@
+livecd-rootfs (1.155) natty; urgency=low
+
+  * Add headless image type for armel minimal developer image building,
+    same as base now, but may be modified later.
+  * Disable running of flash-kernel on armel as it breaks the script when
+    there is no boot partition available to update.
+
+ -- Jani Monoses <jani@ubuntu.com>  Wed, 26 Jan 2011 14:01:18 +0200
+
 livecd-rootfs (1.154) natty; urgency=low
 
   * apply setting of the default session to all ubuntu-armel builds

livecd.sh

@@ -196,9 +196,9 @@ esac; done;
 shift $((OPTIND-1))
 
 if (( $# == 0 )) || [ "X$1" = "Xall" ]; then
-    set -- ubuntu kubuntu kubuntu-mobile kubuntu-netbook edubuntu xubuntu mythbuntu gobuntu base
+    set -- ubuntu kubuntu kubuntu-mobile kubuntu-netbook edubuntu xubuntu mythbuntu gobuntu base headless
     if [ "$ARCH" = "i386" ]; then
-        set -- ubuntu ubuntu-dvd kubuntu kubuntu-dvd kubuntu-mobile kubuntu-netbook edubuntu edubuntu-dvd mythbuntu xubuntu gobuntu base
+        set -- ubuntu ubuntu-dvd kubuntu kubuntu-dvd kubuntu-mobile kubuntu-netbook edubuntu edubuntu-dvd mythbuntu xubuntu gobuntu base headless
     fi
 fi
 
@@ -210,7 +210,7 @@ fi
 
 for arg in "$@"; do
     case "$arg" in
-       ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-mobile|kubuntu-netbook|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook|ubuntu-moblin-remix|base|tocd)
+       ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-mobile|kubuntu-netbook|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook|ubuntu-moblin-remix|base|headless|tocd)
 	    ;;
 	*)
 	    echo bad name >&2;
@@ -311,6 +311,10 @@ Flags: seen
 	    LIST="$LIST minimal^ standard^"
 	    LIVELIST="$LIVE_BOOT_SCRIPTS"
 	    ;;
+	headless)
+	    LIST="$LIST minimal^ standard^"
+	    LIVELIST="$LIVE_BOOT_SCRIPTS"
+	    ;;
 	tocd)
 	    LIST="$LIST minimal^ standard^"
 	    tocdtmp=`mktemp -d` || exit 1
@@ -421,6 +425,8 @@ link_in_boot = $link_in_boot
 	powerpc)	LIST="$LIST linux-powerpc linux-powerpc64-smp";;
 	sparc*)		LIST="$LIST linux-sparc64";;
 	armel)
+			#inhibit running of flash-kernel for armel
+    			export FLASH_KERNEL_SKIP=1
 			case "$SUBARCH" in
 				imx51)
 					LIST="$LIST linux-imx51"