From cc1f6a57db9699e120a378405437dbee7c4a5ef1 Mon Sep 17 00:00:00 2001
From: wookey <wookey@563faec7-e20c-0410-992a-a66f704d0ccd>
Date: Fri, 1 Oct 2010 01:42:06 +0000
Subject: [PATCH] Check in fixes for apt authentication on 0.8 and updates for
 Ubuntu maverick config

git-svn-id: http://emdebian.org/svn/current@7502 563faec7-e20c-0410-992a-a66f704d0ccd
---
 cross/setcrossarch.sh     |  5 +++++
 debian/changelog          | 10 ++++++++--
 debian/multistrap.install |  1 +
 examples/maverick.conf    |  2 +-
 multistrap                |  4 +++-
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/cross/setcrossarch.sh b/cross/setcrossarch.sh
index 1f81b5b..e971459 100755
--- a/cross/setcrossarch.sh
+++ b/cross/setcrossarch.sh
@@ -26,6 +26,11 @@ if [ -z "$dir" ]; then
 	exit 1
 fi
 
+#run chroot script to ensure no unwanted system interactions (e.g. startup scripts)
+if [ -x /usr/share/multistrap/chroot.sh ]; then
+   /usr/share/multistrap/chroot.sh $dir $hostarch
+fi
+
 cfg="/etc/pdebuild-cross/pdebuild-cross.rc"
 if [ -f $cfg ]; then
 	. $cfg
diff --git a/debian/changelog b/debian/changelog
index 2efc437..6978c10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,11 +6,17 @@ multistrap (2.1.8) experimental; urgency=low
   * Add examples for Grip.
   * Add more synopsis information to manual page. (Closes: #592621)
   * Aim 2.1.8 at experimental as squeeze is frozen and this version
-    includes possibly disruptive changes. 
-  * Add support for 'flat' apt-ftparchive-style URLs
+    includes possibly disruptive changes.
 
  -- Neil Williams <codehelp@debian.org>  Wed, 25 Aug 2010 22:59:47 +0100
 
+  * Add support for 'flat' apt-ftparchive-style URLs
+  * Include chroot.sh preventing services being started during chroot creation
+  * Always use the host apt keyring when bootstrapping, since we don't
+    have one yet in the target root.
+
+ -- Wookey <wookey@debian.org>  Fri, 30 Sep 2010 02:21:21 +0100
+
 multistrap (2.1.6) unstable; urgency=low
 
   * [INTL:fr] French manpage translation update (Closes: #584679)
diff --git a/debian/multistrap.install b/debian/multistrap.install
index 59b510f..155f335 100644
--- a/debian/multistrap.install
+++ b/debian/multistrap.install
@@ -10,6 +10,7 @@ examples/grip-squeeze.conf ./usr/share/multistrap/
 examples/grip-lenny.conf ./usr/share/multistrap/
 examples/setup.sh ./usr/share/doc/multistrap/examples/
 examples/config.sh ./usr/share/doc/multistrap/examples/
+examples/chroot.sh ./usr/share/multistrap/
 check-deps.sh ./usr/share/multistrap/
 device-table.pl ./usr/share/multistrap/
 update-rc.d ./usr/share/multistrap/
diff --git a/examples/maverick.conf b/examples/maverick.conf
index 446ce78..0a3dce6 100644
--- a/examples/maverick.conf
+++ b/examples/maverick.conf
@@ -24,4 +24,4 @@ aptsources=Ubuntu
 packages=apt
 source=http://archive.ubuntu.com/ubuntu
 keyring=ubuntu-keyring
-suite=maverick
+suite=maverick universe
diff --git a/multistrap b/multistrap
index 98fc1d6..724df77 100755
--- a/multistrap
+++ b/multistrap
@@ -279,6 +279,8 @@ if (defined $k) {
 
 $config_str = '';
 $config_str .= " -o Apt::Architecture=$arch";
+$config_str .= " -o Dir::Etc::TrustedParts=/etc/apt/trusted.gpg.d";
+$config_str .= " -o Dir::Etc::Trusted=/etc/apt/trusted.gpg";
 $config_str .= " -o Apt::Get::AllowUnauthenticated=true"
 	if (defined $noauth);
 $config_str .= " -o Apt::Get::Download-Only=true";
@@ -669,7 +671,7 @@ sub native {
 	}
 	# reinstall set
 	foreach my $reinst (sort @reinstall) {
-		system ("$str $env chroot $dir apt-get --reinstall -y install $reinst");
+		system ("$str $env chroot $dir apt-get --reinstall -y $forceyes install $reinst");
 	}
 }