diff --git a/BuildLiveCD b/BuildLiveCD
index f5b6e15a..4938d7e0 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -27,7 +27,6 @@ if [ -n "$SSH_ORIGINAL_COMMAND" ]; then
 fi
 ARCH=$(dpkg --print-architecture)
 SUBARCH=""
-SUBARCHARG=""
 NEWSUITE="precise"
 SUITES=""
 PROPOSED=""
@@ -35,24 +34,19 @@ IMAGEFORMAT=""
 LIVE_BUILD=false
 UBUNTU_DEFAULTS_LOCALE=""
 
-while getopts :A:s:r:d:f:pa:lu:t: name; do case $name in
+while getopts :A:s:r:d:f:plu:t: name; do case $name in
     A)	ARCH="$OPTARG";;
     s)	SUBARCH="$OPTARG";;
     r)	SUBPROJECT="$OPTARG";;
     d)	NEWSUITE="$OPTARG";;
     f)	IMAGEFORMAT="$OPTARG";;
     p)	PROPOSED="-p";;
-    a)	APT_SOURCE="-A $OPTARG";;
     l)	LIVE_BUILD=:;;
     u)	UBUNTU_DEFAULTS_LOCALE="$OPTARG";;
     t)	UBUNTU_TOUCH_ANDROID="$OPTARG";;
 esac; done;
 shift $((OPTIND-1))
 
-if [ -n "$SUBARCH" ]; then
-    SUBARCHARG="-s$SUBARCH"
-fi
-
 for s in $NEWSUITE; do
     if [ -d build-${s}-live/chroot-${s} ]; then SUITES="$SUITES $s"; fi
 done
@@ -62,11 +56,9 @@ fi
 for s in $SUITES; do
     case $s in
         dapper|edgy|feisty|gutsy|hardy)
-            ARCHARG=""
             old_suite="yes"
             ;;
         *)
-            ARCHARG="-a$ARCH"
             new_suite="yes"
             ;;
     esac
@@ -144,10 +136,9 @@ for STE in $SUITES; do
 	COMMAND="PROJECT=${FS} SUBPROJECT=${SUBPROJECT} ARCH=${ARCH} SUBARCH=${SUBARCH} lb build"
     elif [ "$UBUNTU_DEFAULTS_LOCALE" ]; then
 	COMMAND="ubuntu-defaults-image --locale ${UBUNTU_DEFAULTS_LOCALE} --arch ${ARCH} --release ${STE}"
-    elif [ "$UBUNTU_TOUCH_ANDROID" ]; then
-	COMMAND="/usr/sbin/ubuntu-touch-android.sh ${SUBARCH}"
     else
-	COMMAND="/usr/sbin/livecd.sh ${SUBARCHARG} ${APT_SOURCE} ${PROPOSED} -d${STE} ${IMAGEFORMAT:+-f$IMAGEFORMAT} ${ARCHARG} ${IMAGEARG} ${FS}"
+	echo "Must pass either -l or -u."
+	exit 1
     fi
     if $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && eatmydata -- $COMMAND" >> ${LOG} 2>&1; then
 	rm -f ${PUBDIR}current
diff --git a/debian/changelog b/debian/changelog
index 3038237e..b4c6e408 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ livecd-rootfs (2.164) UNRELEASED; urgency=low
     much - it shaves a minute off a 48-minute test build on my laptop - but
     it will stop people being distracted by it.)
   * Remove livecd.py, which was never finished.
+  * Remove all vestiges of livecd.sh and ubuntu-touch-android.sh.
+    Requiescant in pace.
 
  -- Colin Watson <cjwatson@ubuntu.com>  Mon, 22 Jul 2013 11:35:23 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 3dbc6696..b93ef389 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-livecd.sh is copyright (c) 2004-2007 by Canonical Ltd.
+live-build/* is copyright (c) 2004-2013 by Canonical Ltd.
 e2fs-zero.py is copyright (c) 2005 by Paul Sladen
 
 These programs are free software; you can redistribute and/or modify
diff --git a/debian/install b/debian/install
index c12d1e96..e40ebc64 100644
--- a/debian/install
+++ b/debian/install
@@ -1,2 +1,2 @@
-livecd.sh e2fs-zero.py usr/sbin
+e2fs-zero.py usr/sbin
 live-build usr/share/livecd-rootfs
diff --git a/livecd.sh b/livecd.sh
deleted file mode 100755
index 2a66b0b8..00000000
--- a/livecd.sh
+++ /dev/null
@@ -1,830 +0,0 @@
-#!/bin/bash
-set -eu
-
-##########################################################################
-####           (c) Copyright 2004-2007 Canonical Ltd.                #####
-#                                                                        #
-# This program is free software; you can redistribute it and/or modify   #
-# it under the terms of the GNU General Public License as published by   #
-# the Free Software Foundation; either version 2, or (at your option)    #
-# any later version.                                                     #
-#                                                                        #
-# This program is distributed in the hope that it will be useful, but    #
-# WITHOUT ANY WARRANTY; without even the implied warranty of             #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU      #
-# General Public License for more details.                               #
-#                                                                        #
-# You should have received a copy of the GNU General Public License with #
-# your Ubuntu system, in /usr/share/common-licenses/GPL, or with the     #
-# livecd-rootfs source package as the file COPYING.  If not, write to    #
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,   #
-# Boston, MA 02110-1301 USA.                                             #
-##########################################################################
-
-# Depends: debootstrap, rsync, python-minimal|python, procps, squashfs-tools, ltsp-server [i386], e2fsprogs
-
-cleanup() {
-    for mnt in ${ROOT}dev/pts ${ROOT}dev/shm ${ROOT}.dev ${ROOT}dev \
-	       ${ROOT}proc/sys/fs/binfmt_misc ${ROOT}proc ${ROOT}sys \
-	       ${ROOT}lib/modules/*/volatile ${ROOT}var/{lock,run}; do
-	umount $mnt || true
-    done
-
-    [ -n "$DEV" ] && umount $DEV && losetup -d $DEV || true
-    grep ${ROOT} /proc/mounts && return 1 || return 0
-}
-
-kill_users() {
-    set +e
-    PIDLIST="$(ls -l /proc/*/root 2>/dev/null | grep -- " -> ${ROOT%/}" | sed -n 's/^.*proc.\([0-9]*\).*$/\1/p')"
-    while [ -n "${PIDLIST}" ]; do
-	echo killing $PIDLIST
-	ps -l $(for p in $PIDLIST; do echo ' '-p $p; done)
-	kill -9 $PIDLIST
-	sleep 2
-	PIDLIST="$(ls -l /proc/*/root 2>/dev/null | grep -- " -> ${ROOT%/}" | sed -n 's/^.*proc.\([0-9]*\).*$/\1/p')"
-    done
-    set -e
-}
-
-without_package() {
-    echo "$2" | tr ' ' '\n' | grep -v "^$1$" | tr '\n' ' '
-}
-
-subst_package() {
-    echo "$3" | tr ' ' '\n' | sed "s/^$1$/$2/" | tr '\n' ' '
-}
-
-
-livefs_squash()
-{
-  squashsort="http://people.ubuntu.com/~tfheen/livesort/${FSS}.list.${TARGETARCH}"
-  #if wget -O livecd.${FSS}.sort ${squashsort} > /dev/null 2>&1; then
-  if false; then
-    echo "Using the squashfs sort list from ${squashsort}."
-  else
-    echo "Unable to fetch squashfs sort list; using a blank list."
-    : > livecd.${FSS}.sort
-  fi
-
-  # make sure there is no old squashfs idling around
-  rm -f livecd.${FSS}.squashfs
-
-  mksquashfs ${ROOT} livecd.${FSS}.squashfs -sort livecd.${FSS}.sort
-  chmod 644 livecd.${FSS}.squashfs
-}
-
-livefs_ext2()
-{
-  # Add 1024MiB extra free space for first boot + ext3 journal + swapfile
-  size=$(($(du -ks ${ROOT} | cut -f1) + (1024000)))
-  MOUNTPOINT=$(mktemp -d)
-  DEV=$(losetup -f)
-  echo "Building ext2 filesystem."
-
-  # remove any stale filesystem images
-  rm -f livecd.${FSS}.ext?
-
-  # create an empty ext2 image and loop mount it
-  dd if=/dev/zero of=livecd.${FSS}.ext2 bs=1024 count=0 seek=$size
-  mke2fs -i 8192 -F livecd.${FSS}.ext2
-  mount -o loop=${DEV} livecd.${FSS}.ext2 ${MOUNTPOINT}
-
-  # copy chroot content to image
-  cp -a ${ROOT}/* ${MOUNTPOINT}
-
-  # Create a swapfile in rootfs we can use or delete later on during first boot.
-  # doing it *during* first boot adds 3min to the bootprocess so the decision
-  # was to do it here. Luckily the file will compress to nearly zero so it does
-  # not add to the image size once we gzipped the image.
-  dd if=/dev/zero of=${MOUNTPOINT}/SWAP.swap bs=1048576 count=512
-  mkswap ${MOUNTPOINT}/SWAP.swap
-
-  # make sure we dont have the buildd name set as hostname (LP: #605972)
-  echo "localhost" >${MOUNTPOINT}/etc/hostname
-
-  # clean up
-  umount ${MOUNTPOINT}
-  rm -rf ${MOUNTPOINT}
-  losetup -d $DEV || true
-  chmod 644 livecd.${FSS}.ext2
-}
-
-checkpoint()
-{
-  echo "===== $1 ====="
-  date
-}
-
-if [ $(id -u) != 0 ];then
-  echo "must be run as root"
-  exit 2
-fi
-
-checkpoint "Starting build"
-
-umask 022
-export TTY=unknown
-export TERM=vt100
-export DEBIAN_FRONTEND=noninteractive
-export LANG=C
-export CASPER_GENERATE_UUID=1
-SRCMIRROR=http://archive.ubuntu.com/ubuntu
-PPAMIRROR=ppa.launchpad.net
-ARCH=$(dpkg --print-architecture)
-OPTMIRROR=
-INITRD_COMPRESSOR=lzma
-TMPFS=no
-
-select_mirror () {
-    case $ARCH in
-	i386|amd64)
-	    case $FS in
-		ubuntu-lpia|ubuntu-mid)
-		    USERMIRROR=http://ports.ubuntu.com/ubuntu-ports
-		    SECMIRROR=${USERMIRROR}
-		    SECSRCMIRROR=${SRCMIRROR}
-		    TARGETARCH=lpia
-		    ;;
-		*)
-		    USERMIRROR=http://archive.ubuntu.com/ubuntu
-		    SECMIRROR=http://security.ubuntu.com/ubuntu
-		    SECSRCMIRROR=${SECMIRROR}
-		    TARGETARCH=${ARCH}
-		    ;;
-	    esac
-	    ;;
-	*)
-	    USERMIRROR=http://ports.ubuntu.com/ubuntu-ports
-	    SECMIRROR=${USERMIRROR}
-	    SECSRCMIRROR=${SRCMIRROR}
-	    TARGETARCH=${ARCH}
-	    ;;
-    esac
-    case $(hostname --fqdn) in
-	bld-*.mmjgroup.com)	MIRROR=${USERMIRROR};;
-	*.mmjgroup.com)		MIRROR=http://archive.mmjgroup.com/${USERMIRROR##*/};;
-	*.0c3.net)
-		case $ARCH in
-			i386|amd64)	MIRROR=http://mirrors.0c3.net/ubuntu/ ;;
-			*)		MIRROR=http://mirrors.0c3.net/ubuntu-ports/ ;;
-		esac
-		;;
-	*.ubuntu.com)		MIRROR=http://ftpmaster.internal/ubuntu;;
-	*.warthogs.hbd.com)	MIRROR=http://ftpmaster.internal/ubuntu;;
-	*.buildd)		MIRROR=http://ftpmaster.internal/ubuntu;;
-	*)			MIRROR=${USERMIRROR};;
-    esac
-
-    if [ "$OPTMIRROR" ]; then
-	MIRROR="$OPTMIRROR"
-    fi
-}
-
-STE=$(lsb_release -cs)
-EXCLUDE=""
-LIST=""
-SUBARCH=""
-PROPOSED=""
-IMAGEFORMAT="squashfs"
-# must be in the "team / PPA name" form; e.g. "moblin/ppa"; the default PPA
-# name is "ppa", don't omit it
-PPA=""
-APT_SOURCE=""
-FORCE_YES=""
-
-while getopts :d:e:i:I:m:S:s:a:A:f:p name; do case $name in
-    d)  STE=$OPTARG;;
-    e)  EXCLUDE="$EXCLUDE $OPTARG";;
-    i)  LIST="$LIST $OPTARG";;
-    I)	UINUM="$OPTARG";;
-    m)	OPTMIRROR="$OPTARG";;
-    S)	USZ="$OPTARG";;
-    s)	SUBARCH="$OPTARG";;
-    a)	ARCH="$OPTARG";;
-    A)	APT_SOURCE="$OPTARG";;
-    f)	IMAGEFORMAT="$OPTARG";;
-    p)  PROPOSED="yes";;
-    \?) echo bad usage >&2; exit 2;;
-    \:) echo missing argument >&2; exit 2;;
-esac; done;
-shift $((OPTIND-1))
-
-if (( $# == 0 )) || [ "X$1" = "Xall" ]; then
-    set -- ubuntu kubuntu kubuntu-active edubuntu xubuntu mythbuntu gobuntu base ubuntu-headless cloud-live
-    if [ "$ARCH" = "i386" ]; then
-        set -- ubuntu ubuntu-dvd kubuntu kubuntu-dvd kubuntu-active edubuntu edubuntu-dvd mythbuntu xubuntu gobuntu base ubuntu-headless
-    fi
-fi
-
-if [ "$IMAGEFORMAT" = "ext2" ] || [ "$IMAGEFORMAT" = "ext3" ]; then
-    LIVE_BOOT_SCRIPTS="jasper"
-else
-    LIVE_BOOT_SCRIPTS="casper lupin-casper"
-fi
-
-for arg in "$@"; do
-    case "$arg" in
-       ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-active|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook|ubuntu-moblin-remix|base|ubuntu-headless|tocd|cloud-live)
-	    ;;
-	*)
-	    echo bad name >&2;
-	    exit 2
-	    ;;
-    esac
-done
-
-ROOT=$(pwd)/chroot-livecd/	# trailing / is CRITICAL
-for FS in "$@"; do
-    FSS="$FS${SUBARCH:+-$SUBARCH}"
-    IMG=livecd.${FSS}.fsimg
-    DEV=""
-    COMP="main restricted"
-
-    select_mirror
-
-    # Just in case there's some leftover junk here:
-    cleanup 2>/dev/null || true
-
-    umount ${ROOT} || true
-    rm -rf ${ROOT}
-    mkdir ${ROOT}
-    # maybe use a tmpfs
-    if  test yes = "$TMPFS"; then
-        mount -t tmpfs -o size=8192M tmpfs ${ROOT} && echo using tmpfs
-    fi
-
-    mkdir -p ${ROOT}etc/dpkg/dpkg.cfg.d
-    cat << @@EOF > ${ROOT}etc/dpkg/dpkg.cfg.d/livecd-rootfs
-force-unsafe-io
-@@EOF
-
-    mkdir -p ${ROOT}var/cache/debconf
-    cat << @@EOF > ${ROOT}var/cache/debconf/config.dat
-Name: debconf/frontend
-Template: debconf/frontend
-Value: Noninteractive
-Owners: debconf
-Flags: seen
-
-@@EOF
-
-    case "$FS" in
-	ubuntu|ubuntu-lpia|ubuntu-dvd)
-	    LIST="$LIST minimal^ standard^ ubuntu-desktop^"
-	    LIVELIST="ubuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
-	    ;;
-	kubuntu|kubuntu-dvd)
-	    LIST="$LIST minimal^ standard^ kubuntu-desktop^"
-	    LIVELIST="kubuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
-	    ;;
-	kubuntu-active)
-	    LIST="$LIST minimal^ standard^ kubuntu-active^"
-	    LIVELIST="kubuntu-active-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
-	    COMP="main restricted universe"
-	    ;;
-	edubuntu|edubuntu-dvd)
-	    LIST="$LIST minimal^ standard^ edubuntu-desktop-gnome^"
-	    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 $LIVE_BOOT_SCRIPTS"
-	    COMP="main restricted universe multiverse"
-	    ;;
-	gobuntu)
-	    LIST="$LIST minimal^ standard^ gobuntu-desktop^"
-	    LIVELIST="gobuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
-	    COMP="main"
-	    ;;
-	ubuntu-mid)
-	    LIST="$LIST minimal^ mobile-mid^"
-	    LIVELIST="mobile-live^ casper ubiquity"
-	    COMP="main restricted universe multiverse"
-	    ;;
-	ubuntu-netbook)
-	    LIST="$LIST minimal^ standard^ ubuntu-netbook^"
-	    LIVELIST="netbook-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
-	    ;;
-	mythbuntu)
-	    LIST="$LIST minimal^ standard^ mythbuntu-desktop^"
-	    LIVELIST="mythbuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
-	    COMP="main restricted universe multiverse"
-	    ;;
-	ubuntu-moblin-remix)
-	    LIST="$LIST minimal^ ubuntu-moblin-remix"
-	    LIVELIST="ubuntu-moblin-live"
-	    COMP="main restricted universe"
-	    PPA="moblin/ppa"
-	    ;;
-	base)
-	    LIST="$LIST minimal^ standard^"
-	    LIVELIST="$LIVE_BOOT_SCRIPTS"
-	    ;;
-	ubuntu-headless)
-	    LIST="$LIST minimal^ standard^"
-	    LIVELIST="$LIVE_BOOT_SCRIPTS"
-	    ;;
-	cloud-live)
-	    LIST="$LIST minimal^ standard^"
-	    LIVELIST="minimal^ standard^ cloud-live-config $LIVE_BOOT_SCRIPTS"
-	    COMP="main restricted universe"
-	    PPA="cloud-live/config"
-	    ;;
-	tocd)
-	    LIST="$LIST minimal^ standard^"
-	    tocdtmp=`mktemp -d` || exit 1
-	    tocdgerminate='http://people.ubuntu.com/~cjwatson/germinate-output/tocd3.1-dapper/'
-	    if wget -O "$tocdtmp"/desktop "$tocdgerminate"/desktop; then
-	        tocddesktop=`awk '{print $1}' "$tocdtmp"/desktop | egrep -v '^-|^Package|^\|' | tr '\n' ' '`
-	        echo "TheOpenCD desktop package list is: $tocddesktop"
-	    else
-	        echo "Unable to fetch tocd-desktop germinate output."
-	        [ -d "$tocdtmp" ] && rm -rf "$tocdtmp"
-		exit 1
-	    fi
-	    if wget -O "$tocdtmp"/live "$tocdgerminate"/live; then
-	        tocdlive=`awk '{print $1}' "$tocdtmp"/live | egrep -v '^-|^Package|^\|' | tr '\n' ' '`
-	        echo "TheOpenCD live package list is: $tocdlive"
-	    else
-	        echo "Unable to fetch tocd-live germinate output."
-	        [ -d "$tocdtmp" ] && rm -rf "$tocdtmp"
-		exit 1
-	    fi
-	    [ -d "$tocdtmp" ] && rm -rf "$tocdtmp"
-	    LIST="$LIST $tocddesktop"
-	    LIVELIST="$tocdlive casper"
-    esac
-    case "$FS" in
-	*-dvd)
-	    LIVELIST="$LIVELIST ${FS}-live^"
-	    UNIVERSE=1
-	    MULTIVERSE=1
-	    ;;
-	*)
-	    UNIVERSE=
-	    MULTIVERSE=
-	    ;;
-    esac
-
-    dpkg -l livecd-rootfs || true	# get our version # in the log.
-    checkpoint "Bootstrapping base system"
-    debootstrap --components=$(echo $COMP | sed 's/ /,/g') --arch $TARGETARCH $STE $ROOT $MIRROR
-
-    # Recent dpkg has started complaining pretty loudly if dev/pts isn't 
-    # mounted, so let's get it mounted immediately after debootstrap:
-    mount -t devpts devpts-${STE}-${FSS}-livefs ${ROOT}dev/pts
-
-    # Just make a few things go away, which lets us skip a few other things.
-    DIVERTS="usr/sbin/mkinitrd usr/sbin/invoke-rc.d"
-    for file in $DIVERTS; do
-	mkdir -p ${ROOT}${file%/*}
-	chroot $ROOT dpkg-divert --add --local --divert /${file}.livecd --rename /${file}
-	cp ${ROOT}/bin/true ${ROOT}$file
-    done
-
-    # /bin/true won't cut it for mkinitrd, need to have -o support.
-    cat << @@EOF > ${ROOT}/usr/sbin/mkinitrd
-#!/usr/bin/python
-import sys
-for i in range(len(sys.argv)):
-    if sys.argv[i]=='-o':
-	open(sys.argv[i+1],"w")
-@@EOF
-    chmod 755 ${ROOT}usr/sbin/mkinitrd
-
-    trap "cleanup" 0 1 2 3 15
-
-    case $TARGETARCH in
-        alpha|amd64|i386|ia64|lpia|m68k|mips|mipsel)
-            link_in_boot=no
-            ;;
-        *)
-            link_in_boot=yes
-            ;;
-    esac
-
-    # Make a good /etc/kernel-img.conf for the kernel packages
-    cat << @@EOF >> ${ROOT}etc/kernel-img.conf
-do_symlinks = yes
-relative_links = yes
-do_bootloader = no
-do_bootfloppy = no
-do_initrd = yes
-link_in_boot = $link_in_boot
-@@EOF
-
-    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;;
-    esac
-
-    case $TARGETARCH in
-	amd64)		LIST="$LIST linux-generic";;
-	i386)		LIST="$LIST linux-generic";;
-
-	# and the bastard stepchildren
-	lpia)		LIST="$LIST linux-lpia";;
-	ia64)		LIST="$LIST linux-ia64";;
-	hppa)		LIST="$LIST linux-hppa32 linux-hppa64";;
-	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"
-					;;
-				dove)
-					LIST="$LIST linux-dove"
-					STRIP_VMLINUZ=no
-					;;
-				omap)
-					LIST="$LIST linux-omap x-loader-omap3-beagle u-boot-linaro-omap3-beagle"
-					STRIP_VMLINUZ=no
-					;;
-				omap4)
-					LIST="$LIST linux-omap4 x-loader-omap4-panda u-boot-linaro-omap4-panda"
-					STRIP_VMLINUZ=no
-					;;
-			esac;;
-	*)		echo "Unknown architecture: no kernel."; exit 1;;
-    esac
-
-    for x in $EXCLUDE; do
-	LIST="$(without_package "$x" "$LIST")"
-    done
-
-    if [ "$STE" = "hardy" ]; then
-	# <hack, hack, hack> use the version of ssl-cert from the release
-	# pocket, because the version in -updates pulls in the large
-	# openssl-blacklist package which we should never need on the
-	# live CD
-	cat << @@EOF > ${ROOT}etc/apt/preferences
-Package: ssl-cert
-Pin: version 1.0.14-0ubuntu2
-Pin-Priority: 991
-@@EOF
-    fi
-
-    # Create a good sources.list, and finish the install
-    checkpoint "Configuring APT"
-    echo deb $MIRROR $STE ${COMP} > ${ROOT}etc/apt/sources.list
-    echo deb $MIRROR ${STE}-security ${COMP} >> ${ROOT}etc/apt/sources.list
-    echo deb $MIRROR ${STE}-updates ${COMP} >> ${ROOT}etc/apt/sources.list
-    if [ "$PROPOSED" = "yes" ]; then
-        echo deb $MIRROR ${STE}-proposed ${COMP} >> ${ROOT}etc/apt/sources.list
-    fi
-    if [ -n "$PPA" ]; then
-        echo deb http://$PPAMIRROR/$PPA/ubuntu ${STE} main >> ${ROOT}etc/apt/sources.list
-
-        # handle PPAs named "ppa" specially; their Origin field in the Release
-        # file does not end with "-ppa" for backwards compatibility
-        origin="${PPA%/ppa}"
-        origin="${origin/\//-}"
-        touch ${ROOT}etc/apt/preferences
-        cat << @@EOF >> ${ROOT}etc/apt/preferences
-Package: *
-Pin: release o=LP-PPA-$origin
-Pin-Priority: 550
-@@EOF
-    fi
-    if [ -n "$APT_SOURCE" ]; then
-	echo deb $APT_SOURCE $STE $COMP >> ${ROOT}etc/apt/sources.list
-	# allow unsigned sources, unfortunately
-	mkdir -p ${ROOT}etc/apt/apt.conf.d
-	echo 'APT::Get::AllowUnauthenticated "yes";' > ${ROOT}etc/apt/apt.conf.d/extra-source-allows-unauthenticated-sources
-	# and add the preferences rules :(
-	APT_PIN=$(echo $APT_SOURCE | sed -e's,http://,,; s,/.*,,')
-	cat >> ${ROOT}etc/apt/preferences << @@EOF
-Package: *
-Pin: release a=$STE
-Pin-Priority: 500
-
-Package: *
-Pin: origin $APT_PIN
-Pin-Priority: 900
-@@EOF
-	FORCE_YES=--force-yes
-    fi
-
-    if [ "$FS" = "ubuntu-moblin-remix" ]; then
-	chroot $ROOT apt-get update
-	chroot $ROOT apt-get -y --force-yes install ubuntu-moblin-ppa-keyring
-	# promote Release.gpg from APT's lists/partial/ to lists/
-	chroot $ROOT apt-get update
-	# workaround LP #442082
-	rm -f ${ROOT}var/cache/apt/{,src}pkgcache.bin
-    fi
-
-    if [ "$FS" = "cloud-live" ]; then
-	chroot $ROOT apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F3531FCE
-	chroot $ROOT apt-get update
-    fi
-
-    # In addition to the ones we got from apt, trust whatever the local system
-    # believes in, but put things back afterwards.
-    cp ${ROOT}etc/apt/trusted.gpg ${ROOT}etc/apt/trusted.gpg.$$
-    cat /etc/apt/trusted.gpg >> ${ROOT}etc/apt/trusted.gpg
-
-    # update and immediately restore the trusted keyring
-    chroot $ROOT apt-get update
-    # we restore the keyring here because on dist-upgrade the
-    # ubuntu-extras-keyring package installs additional keys
-    mv ${ROOT}etc/apt/trusted.gpg.$$ ${ROOT}etc/apt/trusted.gpg
-
-    checkpoint "Upgrading"
-    chroot $ROOT apt-get -y $FORCE_YES --purge dist-upgrade </dev/null
-    checkpoint "Installing main packages"
-    chroot $ROOT apt-get -y --purge install $LIST </dev/null
-
-    # launchpad likes to put dependencies of seeded packages in tasks along with the
-    # actual seeded packages.  In general, this isn't an issue.  With updated kernels
-    # and point-releases, though, we end up with extra header packages:
-    checkpoint "Cleaning up kernel headers"
-    chroot ${ROOT} dpkg -l linux-headers-2\* | grep ^i | awk '{print $2}' \
-        > livecd.${FSS}.manifest-headers
-    chroot ${ROOT} dpkg -l linux-headers-\* | grep ^i | awk '{print $2}' \
-        > livecd.${FSS}.manifest-headers-full
-    HEADERPACKAGES=`cat livecd.${FSS}.manifest-headers-full`
-    HEADERMETA=""
-    for i in `comm -3 livecd.${FSS}.manifest-headers livecd.${FSS}.manifest-headers-full`; do
-        HEADERMETA="$HEADERMETA $i"
-    done
-    case $TARGETARCH in
-        armel)
-            HEADERMETA=linux-headers-${SUBARCH}
-            ;;
-    esac
-    rm -f livecd.${FSS}.manifest-headers livecd.${FSS}.manifest-headers-full
-    chroot ${ROOT} apt-get -y --purge remove $HEADERPACKAGES </dev/null || true
-    chroot ${ROOT} apt-get -y --purge install $HEADERMETA </dev/null || true
-    # End horrible linux-header launchpad workaround.  Hopefully this is temporary.
-
-    chroot ${ROOT} dpkg-query -W --showformat='${Package} ${Version}\n' \
-	> livecd.${FSS}.manifest-desktop
-    checkpoint "Installing live packages"
-    chroot $ROOT apt-get -y --purge install $LIVELIST </dev/null
-    case $FS in
-	edubuntu)
-	    chroot $ROOT apt-cache dumpavail | \
-		grep-dctrl -nsPackage -FTask edubuntu-ship-addon -a \
-				      -FTask edubuntu-live | \
-		sort -u | \
-		xargs chroot $ROOT \
-		    dpkg-query -W --showformat='${Package} ${Version}\n' \
-		>> livecd.${FSS}.manifest-desktop
-	    ;;
-    esac
-    chroot ${ROOT} dpkg-query -W --showformat='${Package} ${Version}\n' \
-	> livecd.${FSS}.manifest
-
-    checkpoint "Cleaning up"
-
-    kill_users
-
-    chroot $ROOT /etc/cron.daily/mlocate || true
-    chroot $ROOT /etc/cron.daily/man-db	|| true
-
-    # remove our diversions
-    for file in $DIVERTS; do
-	ls -ld ${ROOT}${file} ${ROOT}${file}.livecd || true
-	rm -f ${ROOT}${file}
-	chroot $ROOT dpkg-divert --remove --rename /${file}
-    done
-
-    # remove the apt preferences hack if it was added
-    rm -f ${ROOT}etc/apt/preferences
-
-    # And make this look more pristine
-    cat << @@EOF > ${ROOT}etc/apt/sources.list
-deb ${USERMIRROR} $STE ${COMP}
-deb-src ${SRCMIRROR} $STE ${COMP}
-
-deb ${SECMIRROR} ${STE}-security ${COMP}
-deb-src ${SECSRCMIRROR} ${STE}-security ${COMP}
-
-## Major bug fix updates produced after the final release of the
-## distribution.
-deb ${USERMIRROR} ${STE}-updates ${COMP}
-deb-src ${SRCMIRROR} ${STE}-updates ${COMP}
-
-@@EOF
-    if [ "$UNIVERSE" ]; then
-	COMMENT=
-    else
-	cat << @@EOF >> ${ROOT}etc/apt/sources.list
-## Uncomment the following two lines to add software from the 'universe'
-## repository.
-@@EOF
-	COMMENT='# '
-    fi
-    cat << @@EOF >> ${ROOT}etc/apt/sources.list
-## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
-## team. Also, please note that software in universe WILL NOT receive any
-## review or updates from the Ubuntu security team.
-${COMMENT}deb ${USERMIRROR} $STE universe
-${COMMENT}deb-src ${SRCMIRROR} $STE universe
-${COMMENT}deb ${USERMIRROR} ${STE}-updates universe
-${COMMENT}deb-src ${SRCMIRROR} ${STE}-updates universe
-${COMMENT}deb ${SECMIRROR} ${STE}-security universe
-${COMMENT}deb-src ${SECSRCMIRROR} ${STE}-security universe
-
-@@EOF
-    if [ "$MULTIVERSE" ]; then
-	COMMENT=
-    else
-	COMMENT='# '
-    fi
-    cat << @@EOF >> ${ROOT}etc/apt/sources.list
-## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
-## team, and may not be under a free licence. Please satisfy yourself as to
-## your rights to use the software. Also, please note that software in
-## multiverse WILL NOT receive any review or updates from the Ubuntu
-## security team.
-${COMMENT}deb ${USERMIRROR} $STE multiverse
-${COMMENT}deb-src ${SRCMIRROR} $STE multiverse
-${COMMENT}deb ${USERMIRROR} ${STE}-updates multiverse
-${COMMENT}deb-src ${SRCMIRROR} ${STE}-updates multiverse
-${COMMENT}deb ${SECMIRROR} ${STE}-security multiverse
-${COMMENT}deb-src ${SECSRCMIRROR} ${STE}-security multiverse
-@@EOF
-    if [ -n "$PPA" ]; then
-    cat << @@EOF >> ${ROOT}etc/apt/sources.list
-
-## The following unsupported and untrusted Personal Archives (PPAs) were used
-## to create the base image of this system
-deb http://$PPAMIRROR/$PPA/ubuntu ${STE} main
-deb-src http://$PPAMIRROR/$PPA/ubuntu ${STE} main
-@@EOF
-
-        # handle PPAs named "ppa" specially; their Origin field in the Release
-        # file does not end with "-ppa" for backwards compatibility
-        origin="${PPA%/ppa}"
-        origin="${origin/\//-}"
-        touch ${ROOT}etc/apt/preferences
-        cat << @@EOF >> ${ROOT}etc/apt/preferences
-Explanation: This prefers the Personal Archive $PPA over the other sources
-Package: *
-Pin: release o=LP-PPA-$origin
-Pin-Priority: 550
-@@EOF
-    fi
-
-    # get rid of the .debs - we don't need them.
-    chroot ${ROOT} apt-get clean
-    rm -f ${ROOT}var/lib/apt/lists/*_*
-    rm -f ${ROOT}var/spool/postfix/maildrop/*
-    # Removing update-notifier notes is now considered harmful:
-    #rm -f ${ROOT}var/lib/update-notifier/user.d/*
-    # The D-Bus machine identifier needs to be unique, and is generated at
-    # boot time if it's missing.
-    rm -f ${ROOT}var/lib/dbus/machine-id
-    chroot $ROOT apt-get update || true	# give them fresh lists, but don't fail
-    rm -f ${ROOT}etc/resolv.conf ${ROOT}etc/mailname
-    if [ -f ${ROOT}/etc/postfix/main.cf ]; then
-	sed -i '/^myhostname/d; /^mydestination/d; /^myorigin/d' ${ROOT}etc/postfix/main.cf
-	echo set postfix/destinations | chroot ${ROOT} /usr/bin/debconf-communicate postfix
-	echo set postfix/mailname | chroot ${ROOT} /usr/bin/debconf-communicate postfix
-    fi
-    KVERS=`chroot ${ROOT} dpkg -l linux-image-2\*|grep ^i|awk '{print $2}'|sed 's/linux-image-//'`
-    for KVER in ${KVERS}; do
-	SUBARCH="${KVER#*-*-}"
-	chroot ${ROOT} update-initramfs -k "${KVER}" -u
-	# we mv the initramfs, so it's not wasting space on the livefs
-	mv ${ROOT}/boot/initrd.img-"${KVER}" livecd.${FSS}.initrd-"${SUBARCH}"
-	rm -f ${ROOT}/boot/initrd.img-"${KVER}".bak
-	# whether to strip vmlinuz or not to save space thanks to ubiquity
-	action="cp"
-	if [ "$STRIP_VMLINUZ" = "yes" ]; then
-	    action="mv"
-	fi
-	$action ${ROOT}/boot/vmlinu?-"${KVER}" livecd.${FSS}.kernel-"${SUBARCH}"
-	chmod 644 livecd.${FSS}.kernel-"${SUBARCH}"
-	if [ "$INITRD_COMPRESSOR" != gz ]; then
-	    zcat "livecd.${FSS}.initrd-${SUBARCH}" | "$INITRD_COMPRESSOR" -9c \
-		> "livecd.${FSS}.initrd-${SUBARCH}.new"
-	    mv "livecd.${FSS}.initrd-${SUBARCH}.new" \
-		"livecd.${FSS}.initrd-${SUBARCH}"
-	fi
-    done
-    NUMKVERS="$(set -- $KVERS; echo $#)"
-    if [ "$NUMKVERS" = 1 ]; then
-	# only one kernel
-	SUBARCH="${KVERS#*-*-}"
-	ln -sf livecd.${FSS}.initrd-"${SUBARCH}" livecd.${FSS}.initrd
-	ln -sf livecd.${FSS}.kernel-"${SUBARCH}" livecd.${FSS}.kernel
-    fi
-    case $TARGETARCH+$SUBARCH in
-	powerpc+ps3)
-	    chroot ${ROOT} addgroup --system spu;;
-    esac
-
-    # No point keeping Gnome icon cache around for Kubuntu
-    if [ "$FS" = "kubuntu" ] || \
-       [ "$FS" = "kubuntu-active" ]; then
-        rm -f ${ROOT}/usr/share/icons/*/icon-theme.cache
-    fi
-
-    if [ "$FS" = ubuntu-netbook ] && \
-       [ "$TARGETARCH" = armel ] && \
-       [ -e "$ROOT/usr/share/xsessions/unity-2d.desktop" ]; then
-        chroot $ROOT /usr/lib/gdm/gdm-set-default-session unity-2d
-    fi
-
-    # all done with the chroot; reset the debconf frontend, so Colin doesn't cry
-    echo RESET debconf/frontend | chroot $ROOT debconf-communicate
-    echo FSET debconf/frontend seen true | chroot $ROOT debconf-communicate
-
-    # And now that we're done messing with debconf, destroy the backup files:
-    rm -f ${ROOT}/var/cache/debconf/*-old
-
-    rm -f ${ROOT}/etc/dpkg/dpkg.cfg.d/livecd-rootfs
-
-    # show the size of directories in /usr/share/doc
-    checkpoint "Checking size of /usr/share/doc"
-    echo BEGIN docdirs
-    (cd $ROOT && find usr/share/doc -maxdepth 1 -type d | xargs du -s | sort -nr)
-    echo END docdirs
-
-    # search for duplicate files, write the summary to stdout, 
-    if which fdupes >/dev/null 2>&1; then
-	checkpoint "Checking for duplicate files"
-	echo "first line: <total size for dupes> <different dupes> <all dupes>"
-	echo "data lines: <size for dupes> <number of dupes> <file size> <filename> [<filename> ...]"
-	echo BEGIN fdupes
-	(cd $ROOT \
-	   && fdupes --recurse --noempty --sameline --size --quiet usr \
-	   | awk '/bytes each/ {s=$1} /^usr/ { n+=1; n2+=NF-1; sum+=s*(NF-1); print s*(NF-1), NF-1, s, $0 } END {print sum, n, n2}' \
-	   | sort -nr
-	)
-	echo END fdupes
-    fi
-
-    # Dirty hack to mark langpack stuff as manually installed
-    perl -i -nle 'print unless /^Package: language-(pack|support)/ .. /^$/;' \
-        ${ROOT}/var/lib/apt/extended_states
-
-    # And run the cleanup function dead last, to umount /proc after nothing
-    # else needs to be run in the chroot (umounting it earlier breaks rm):
-    cleanup
-
-    # Squashfs does not report unpacked disk space usage, which is explained at
-    # <http://lkml.org/lkml/2006/6/16/163>.  However, we would like to cache this
-    # number for partman's sufficient free space check and ubiquity's
-    # installation progress calculation.
-    checkpoint "Calculating total size"
-    printf $(du -sx --block-size=1 ${ROOT} | cut -f1) > livecd.${FSS}.size || true
-
-
-    # Build our images
-    checkpoint "Building image"
-    if [ "$IMAGEFORMAT" = "ext2" ] || [ "$IMAGEFORMAT" = "ext3" ]; then
-        livefs_ext2
-    else
-        livefs_squash
-    fi
-
-    # Upgrade ext2->ext3 if that's what is requested
-    if [ "$IMAGEFORMAT" = "ext3" ]; then
-        tune2fs -j livecd.${FSS}.ext2
-        mv livecd.${FSS}.ext2 livecd.${FSS}.ext3
-        # temporary workaround for LP: #583317 with ext3 images
-        e2fsck -fy livecd.${FSS}.ext3 || true
-    fi
-
-    # LTSP chroot building (only in 32bit and for Edubuntu (DVD))
-    case $FS in
-        edubuntu-dvd)
-            if [ "$TARGETARCH" = "i386" ]; then
-                checkpoint "Building LTSP chroot"
-                ltsp-build-client --base $(pwd) --mirror $MIRROR --arch $TARGETARCH --dist $STE --chroot ltsp-live --late-packages ldm-edubuntu-theme,plymouth-theme-edubuntu --purge-chroot --skipimage
-                mkdir -p $(pwd)/images
-                mksquashfs $(pwd)/ltsp-live $(pwd)/images/ltsp-live.img -e cdrom
-                rm -Rf $(pwd)/ltsp-live
-                if [ -f $(pwd)/images/ltsp-live.img ]; then
-                    mv $(pwd)/images/ltsp-live.img 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."
-                fi
-            fi
-        ;;
-    esac
-done
-
-checkpoint "Done"