From aa826a28b33433703b79272c4714c4828dfa19a1 Mon Sep 17 00:00:00 2001
From: Evan Dandrea <ev@ubuntu.com>
Date: Wed, 6 Jul 2011 16:57:39 +0100
Subject: [PATCH] Import patches-unapplied version 2.12 to ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: 597d603590653fd4bd7ae259f2090ddd8a68adbe

New changelog entries:
  [ Colin Watson ]
  * Re-enable deb-src lines for Edubuntu (LP: #806428).
---
 debian/changelog       |  7 +++++++
 live-build/auto/config | 10 ++++++++--
 livecd.sh              |  7 ++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ecb3581..5f6cb503 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.12) oneiric; urgency=low
+
+  [ Colin Watson ]
+  * Re-enable deb-src lines for Edubuntu (LP: #806428).
+
+ -- Evan Dandrea <ev@ubuntu.com>  Wed, 06 Jul 2011 16:57:39 +0100
+
 livecd-rootfs (2.11) oneiric; urgency=low
 
   * Pass SUBPROJECT to live-build.
diff --git a/live-build/auto/config b/live-build/auto/config
index ba43dc31..c860aecc 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -12,7 +12,12 @@ if [ -z "$MIRROR" ]; then
 				*)		MIRROR=http://archive.mmjgroup.com/ubuntu-ports/ ;;
 			esac
 			;;
-		*.0c3.net)		MIRROR=http://ftp.iinet.net.au/linux/ubuntu/ ;;
+		*.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/ ;;
@@ -47,6 +52,7 @@ add_package ()
 OPTS=
 COMPONENTS=
 BINARY_REMOVE_LINUX=:
+SOURCE='--source false'
 LIVE_TASK=
 
 case $IMAGEFORMAT in
@@ -167,7 +173,7 @@ lb config noauto \
 	--bootstrap-keyring ubuntu-keyring \
 	--binary-images none \
 	--memtest none \
-	--source false \
+	$SOURCE \
 	--build-with-chroot false \
 	${MIRROR:+--parent-mirror-bootstrap $MIRROR} \
 	${COMPONENTS:+--parent-archive-areas "$COMPONENTS"} \
diff --git a/livecd.sh b/livecd.sh
index 28dd4c3c..711bf28f 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -164,7 +164,12 @@ select_mirror () {
     case $(hostname --fqdn) in
 	bld-*.mmjgroup.com)	MIRROR=${USERMIRROR};;
 	*.mmjgroup.com)		MIRROR=http://archive.mmjgroup.com/${USERMIRROR##*/};;
-	*.0c3.net)		MIRROR=http://ftp.iinet.net.au/linux/ubuntu;;
+	*.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;;