From 23bffaae7fa07e5e2f84fda2bfadf07adbe2fa04 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 23 Jul 2014 01:50:21 +0100
Subject: [PATCH] Import patches-unapplied version 2.226 to
 ubuntu/utopic-proposed

Imported using git-ubuntu import.

Changelog parent: 92db4fa1efb3c12b4954b3a3e100b4896c0c3a1d

New changelog entries:
  * Disable apt authentication checks when building ubuntu-rtm images
    against dogfood (that test archive is signed, but not with a very useful
    key).
  * Apply a grievous hack to get debootstrap working against ubuntu-rtm
    series.
---
 debian/changelog       | 10 ++++++++++
 live-build/auto/config | 17 +++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8f461ca6..84fc082c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+livecd-rootfs (2.226) utopic; urgency=medium
+
+  * Disable apt authentication checks when building ubuntu-rtm images
+    against dogfood (that test archive is signed, but not with a very useful
+    key).
+  * Apply a grievous hack to get debootstrap working against ubuntu-rtm
+    series.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 23 Jul 2014 01:50:21 +0100
+
 livecd-rootfs (2.225) utopic; urgency=medium
 
   * Use the soon-to-exist ubuntu-rtm archive for ubuntu-touch builds if
diff --git a/live-build/auto/config b/live-build/auto/config
index 85f685ea..a16529fb 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -344,6 +344,7 @@ case $PROJECT in
 		case $SUBPROJECT in
 		    ubuntu-rtm/dogfood)
 			MIRROR=http://derived-archive.dogfood.content.paddev.net/ubuntu-rtm/
+			OPTS="${OPTS:+$OPTS }--apt-secure false"
 			;;
 		    ubuntu-rtm)
 			MIRROR=http://derived.archive.canonical.com/ubuntu-rtm/
@@ -572,6 +573,22 @@ if [ "$EXTRA_PPAS" ]; then
 	      config/archives/extra-ppas.key.binary
 fi
 
+case $SUBPROJECT in
+    ubuntu-rtm|ubuntu-rtm/*)
+	# debootstrap doesn't know about ubuntu-rtm series directly.  Rather
+	# than having to teach it, we employ a few hacks to make it use the
+	# Ubuntu script instead.
+	mkdir -p config/fake_debootstrap_dir/scripts
+	ln -s /usr/share/debootstrap/devices.tar.gz \
+		config/fake_debootstrap_dir/
+	ln -s /usr/share/debootstrap/functions config/fake_debootstrap_dir/
+	ln -s /usr/share/debootstrap/scripts/gutsy \
+		"config/fake_debootstrap_dir/scripts/$SUITE"
+	echo 'export DEBOOTSTRAP_DIR="$PWD/config/fake_debootstrap_dir"' \
+		>> config/bootstrap
+	;;
+esac
+
 # cribbed from cdimage, perhaps this should be a small helper script in germinate?
 add_inheritance () {
 	case " $inherit " in