diff -Nru debootstrap-1.0.29ubuntu1~lucid1/debian/changelog debootstrap-1.0.37ubuntu1~lucid1/debian/changelog
--- debootstrap-1.0.29ubuntu1~lucid1/debian/changelog	2011-05-23 11:57:33.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/debian/changelog	2011-10-24 16:34:56.000000000 +0000
@@ -1,15 +1,109 @@
-debootstrap (1.0.29ubuntu1~lucid1) lucid-backports; urgency=low
+debootstrap (1.0.37ubuntu1~lucid1) lucid-backports; urgency=low
 
-  * Automated backport upload; no source changes.
+  * No change backport.
 
- -- Colin Watson <cjwatson@canonical.com>  Mon, 23 May 2011 11:57:33 +0000
+ -- Tim Gardner <tim.gardner@canonical.com>  Mon, 24 Oct 2011 10:34:22 -0600
 
-debootstrap (1.0.29ubuntu1) natty; urgency=low
+debootstrap (1.0.37) unstable; urgency=low
 
-  * Cherry-pick from trunk:
-    - Resolve dependencies from all requested components (LP: #740167).
+  * Add (Ubuntu) precise as a symlink to gutsy.
 
- -- Colin Watson <cjwatson@ubuntu.com>  Wed, 13 Apr 2011 18:48:24 +0100
+ -- Colin Watson <cjwatson@debian.org>  Wed, 05 Oct 2011 21:58:37 +0100
+
+debootstrap (1.0.36) unstable; urgency=low
+
+  * Guess host OS based on uname for non-Debian systems. Closes: #637363
+  * Clarify "target" in usage message.
+  * Fix support for running debootstrap on a FreeBSD host to create a kFreeBSD
+    chroot or jail. Thanks, Arno Toell.
+  * Search PATH for programs, rather than checking hardcoded locations.
+  * Support using md5 and shaN programs, as found on FreeBSD, in addition
+    to md5sum and shaNsum.
+  * When FreeBSD (not kfreebsd) is the host, don't chroot to mount special
+    filesystems.
+  * When debootstrapping on FreeBSD, warn if necessary modules are not
+    loaded. Thanks, Arno Toell.
+  * Workaround for umount bug #634107, which broke pbuilder and "debootstrap ."
+    Closes: #631087
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 21 Aug 2011 18:39:26 -0400
+
+debootstrap (1.0.35) unstable; urgency=low
+
+  [ Robert Millan ]
+  * Don't build devices.tar.gz if building on GNU/kFreeBSD (closes:
+    #637297).
+  * Don't use --arch when we specifically care about the host architecture
+    (closes: #637298).
+
+ -- Colin Watson <cjwatson@debian.org>  Wed, 10 Aug 2011 13:04:41 +0100
+
+debootstrap (1.0.34) unstable; urgency=low
+
+  * Add more information regarding the version and architecture in case
+    a download fails. Closes: #633625.
+  * add /usr/sbin and /sbin to PATH for fakechroot variant. Closes:
+    #588773
+  * Move setup_devices to second stage of bootstrap. Closes: #498731,
+    #531316
+
+ -- Otavio Salvador <otavio@debian.org>  Thu, 28 Jul 2011 19:13:10 +0200
+
+debootstrap (1.0.33) unstable; urgency=low
+
+  [ Joey Hess ]
+  * Mention minbase variant in --help. Closes: #632418
+  * Use md5sums for sarge, which did not consistently have sha1sums
+    everywhere. Closes: #633158
+
+  [ Colin Watson ]
+  * Improve text of error message when decompression command is not
+    available.
+
+ -- Otavio Salvador <otavio@debian.org>  Sun, 24 Jul 2011 10:33:56 +0200
+
+debootstrap (1.0.32) unstable; urgency=low
+
+  * Use md5sums for woody and potato, which only had those checksums
+    in the Packages files. Closes: #627365
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 30 May 2011 13:57:46 -0400
+
+debootstrap (1.0.31) unstable; urgency=low
+
+  [ Mark Hymers ]
+  * Don't use the Build-Essential: yes field in Debian, use the
+    build-essential package. Closes: #619700.
+
+  [ Colin Watson ]
+  * If ubuntu-keyring is installed, check Release signatures against it when
+    bootstrapping Ubuntu gutsy and later.
+  * Recommend ubuntu-keyring rather than debian-archive-keyring on
+    Ubuntu-derived systems.
+
+ -- Colin Watson <cjwatson@debian.org>  Fri, 20 May 2011 09:45:48 +0100
+
+debootstrap (1.0.30) unstable; urgency=low
+
+  [ Joey Hess ]
+  * Recommend debian-archive-keyring, and if it is installed,
+    default to checking gpg signatures of the Release file against it
+    when bootstrapping sid, squeeze, wheezy, etch, and lenny.
+    Closes: #560038
+  * Add --no-check-gpg option that can be used to disable release file
+    verification. Closes: #624229
+  * Needs base-installer 1.117.
+  * Add a warning message if the keyring file is not available, and
+    --no-check-gpg is not specified.
+  * Clear all global variables used for options, so that unclean
+    environment doesn't break debootstrap. Closes: #621657
+  * Removed the --boot-floppies switch and mode. Assuming this has
+    not been used in 10 years.
+
+  [ Colin Watson ]
+  * Resolve dependencies from all requested components (LP: #740167).
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 26 Apr 2011 17:10:00 -0400
 
 debootstrap (1.0.29) unstable; urgency=low
 
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/debian/control debootstrap-1.0.37ubuntu1~lucid1/debian/control
--- debootstrap-1.0.29ubuntu1~lucid1/debian/control	2011-04-13 17:48:36.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/debian/control	2011-08-10 11:59:34.000000000 +0000
@@ -1,18 +1,17 @@
 Source: debootstrap
 Section: admin
 Priority: extra
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
-Uploaders: Anthony Towns <ajt@debian.org>, Joey Hess <joeyh@debian.org>, Frans Pop <fjp@debian.org>, Junichi Uekawa <dancer@debian.org>, Colin Watson <cjwatson@debian.org>
-Build-Depends: debhelper (>= 7.0.50), makedev (>= 2.3.1-69) [!hurd-i386]
-Standards-Version: 3.9.1
+Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
+Uploaders: Anthony Towns <ajt@debian.org>, Joey Hess <joeyh@debian.org>, Junichi Uekawa <dancer@debian.org>, Colin Watson <cjwatson@debian.org>
+Build-Depends: debhelper (>= 7.0.50), makedev (>= 2.3.1-69) [linux-any]
+Standards-Version: 3.9.2
 Vcs-Browser: http://git.debian.org/?p=d-i/debootstrap.git
 Vcs-Git: git://git.debian.org/d-i/debootstrap.git
 
 Package: debootstrap
 Architecture: all
 Depends: ${misc:Depends}, wget
-Recommends: gnupg
+Recommends: gnupg, ${keyring}
 Description: Bootstrap a basic Debian system
  debootstrap is used to create a Debian base system from scratch,
  without requiring the availability of dpkg or apt. It does this by
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/debian/copyright debootstrap-1.0.37ubuntu1~lucid1/debian/copyright
--- debootstrap-1.0.29ubuntu1~lucid1/debian/copyright	2011-01-18 00:13:28.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/debian/copyright	2011-04-13 13:26:51.000000000 +0000
@@ -5,8 +5,6 @@
 based loosely on the code for constructing base tarballs as part of the
 boot-floppies package.
 
-The upstream site is http://code.erisian.com.au/Wiki/debootstrap .
-
 Copyright:
 
 Copyright (c) 2001-2005 Anthony Towns
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/debian/rules debootstrap-1.0.37ubuntu1~lucid1/debian/rules
--- debootstrap-1.0.29ubuntu1~lucid1/debian/rules	2011-01-18 00:13:28.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/debian/rules	2011-05-20 08:36:12.000000000 +0000
@@ -1,5 +1,11 @@
 #! /usr/bin/make -f
 
+ifeq (0,$(shell dpkg-vendor --derives-from Ubuntu; echo $$?))
+  KEYRING := ubuntu-keyring
+else
+  KEYRING := debian-archive-keyring
+endif
+
 %:
 	dh $@
 
@@ -27,3 +33,6 @@
 		debian/debootstrap-udeb/usr/share/debootstrap/scripts/stable \
 		debian/debootstrap-udeb/usr/share/debootstrap/scripts/testing \
 		debian/debootstrap-udeb/usr/share/debootstrap/scripts/unstable
+
+override_dh_gencontrol:
+	dh_gencontrol -- -Vkeyring=$(KEYRING)
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/debootstrap debootstrap-1.0.37ubuntu1~lucid1/debootstrap
--- debootstrap-1.0.29ubuntu1~lucid1/debootstrap	2011-02-23 03:07:08.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/debootstrap	2011-10-05 20:56:28.000000000 +0000
@@ -25,7 +25,25 @@
 LANG=C
 USE_COMPONENTS=main
 KEYRING=""
+DISABLE_KEYRING=""
 VARIANT=""
+ARCH=""
+HOST_ARCH=""
+HOST_OS=""
+KEEP_DEBOOTSTRAP_DIR=""
+USE_DEBIANINSTALLER_INTERACTION=""
+SECOND_STAGE_ONLY=""
+CHROOTDIR=""
+MAKE_TARBALL=""
+KEEP_DEBOOTSTRAP_DIR=""
+EXTRACTOR_OVERRIDE=""
+UNPACK_TARBALL=""
+ADDITIONAL=""
+EXCLUDE=""
+VERBOSE=""
+CERTIFICATE=""
+CHECKCERTIF=""
+PRIVATEKEY=""
 
 DEF_MIRROR="http://ftp.us.debian.org/debian"
 
@@ -61,7 +79,7 @@
 usage()
 {
 	echo "Usage: ${0##*/} [OPTION]... <suite> <target> [<mirror> [<script>]]"
-	echo "Bootstrap Debian base system."
+	echo "Bootstrap a Debian base system into a target directory."
 	echo
 	cat <<EOF
       --help                 display this help and exit
@@ -71,7 +89,7 @@
       --download-only        download packages, but don't perform installation
       --print-debs           print the packages to be installed, and exit
 
-      --arch=A               set the target architecture (use if no dpkg)
+      --arch=A               set the architecture to install (use if no dpkg)
                                [ --arch=powerpc ]
 
       --include=A,B,C        adds specified names to the list of base packages
@@ -80,8 +98,9 @@
                              archive
       --variant=X            use variant X of the bootstrap scripts
                              (currently supported variants: buildd, fakechroot,
-                              scratchbox)
+                              scratchbox, minbase)
       --keyring=K            check Release files against keyring K
+      --no-check-gpg         avoid checking Release file signatures
       --no-resolve-deps      don't try to resolve dependencies automatically
 
       --unpack-tarball=T     acquire .debs from a tarball instead of http
@@ -92,7 +111,6 @@
                                (requires --second-stage)
       --extractor=TYPE       override automatic .deb extractor selection
                                (supported: $EXTRACTORS_SUPPORTED)
-      --boot-floppies        used for internal purposes by boot-floppies
       --debian-installer     used for internal purposes by debian-installer
       --private-key=file     read the private key from file
       --certificate=file     use the client certificate stored in file (PEM)
@@ -119,20 +137,7 @@
 		echo "debootstrap $VERSION"
 		exit 0
 		;;
-	    --boot-floppies)
-		if [ -n "$USE_DEBIANINSTALLER_INTERACTION" ] ; then
-			error 1 ARG_BFDI "Can only use one of --boot-floppies and --debian-installer"
-		fi
-		if ! (echo -n "" >&3) 2>/dev/null; then
-			error 1 ARG_BFBYHAND "If running debootstrap by hand, don't use --boot-floppies"
-		fi
-		USE_BOOTFLOPPIES_INTERACTION=yes
-		shift
-		;;
 	    --debian-installer)
-		if [ -n "$USE_BOOTFLOPPIES_INTERACTION" ] ; then
-			error 1 ARG_BFDI "Can only use one of --boot-floppies and --debian-installer"
-		fi
 		if ! (echo -n "" >&3) 2>/dev/null; then
 			error 1 ARG_DIBYHAND "If running debootstrap by hand, don't use --debian-installer"
 		fi
@@ -240,31 +245,31 @@
 		;;
 	    --include|--include=?*)
 		if [ "$1" = "--include" -a -n "$2" ]; then
-			additional="$2"
+			ADDITIONAL="$2"
 			shift 2
                 elif [ "$1" != "${1#--include=}" ]; then
-			additional="${1#--include=}"
+			ADDITIONAL="${1#--include=}"
 			shift 1
 		else
 			error 1 NEEDARG "option requires an argument %s" "$1"
 		fi
-		additional="$(echo "$additional" | tr , " ")"
+		ADDITIONAL="$(echo "$ADDITIONAL" | tr , " ")"
 		;;
 	    --exclude|--exclude=?*)
 		if [ "$1" = "--exclude" -a -n "$2" ]; then
-			exclude="$2"
+			EXCLUDE="$2"
 			shift 2
                 elif [ "$1" != "${1#--exclude=}" ]; then
-			exclude="${1#--exclude=}"
+			EXCLUDE="${1#--exclude=}"
 			shift 1
 		else
 			error 1 NEEDARG "option requires an argument %s" "$1"
 		fi
-		exclude="$(echo "$exclude" | tr , " ")"
+		EXCLUDE="$(echo "$EXCLUDE" | tr , " ")"
 		;;
 	    --verbose)
-		verbose=true
-		export verbose
+		VERBOSE=true
+		export VERBOSE
 		shift 1
 		;;
 	    --components|--components=?*)
@@ -304,6 +309,10 @@
 			error 1 NEEDARG "option requires an argument %s" "$1"
 		fi
 		;;
+	    --no-check-gpg)
+			shift 1
+			DISABLE_KEYRING=1
+		;;
 	    --certificate|--certificate=?*)
 		if [ "$1" = "--certificate" -a -n "$2" ]; then
 			CERTIFICATE="--certificate=$2"
@@ -382,18 +391,47 @@
 
 ###########################################################################
 
-if [ "$ARCH" != "" ]; then
-	true
-elif [ -x /usr/bin/dpkg ] && \
-     /usr/bin/dpkg --print-architecture >/dev/null 2>&1; then
-	ARCH=`/usr/bin/dpkg --print-architecture`
-elif type udpkg >/dev/null 2>&1 && \
+if in_path dpkg && \
+     dpkg --print-architecture >/dev/null 2>&1; then
+	HOST_ARCH=`/usr/bin/dpkg --print-architecture`
+elif in_path udpkg && \
      udpkg --print-architecture >/dev/null 2>&1; then
-	ARCH=`/usr/bin/udpkg --print-architecture`
+	HOST_ARCH=`/usr/bin/udpkg --print-architecture`
 elif [ -e $DEBOOTSTRAP_DIR/arch ]; then
-	ARCH=`cat $DEBOOTSTRAP_DIR/arch`
-else
-	error 1 WHATARCH "Couldn't work out current architecture"
+	HOST_ARCH=`cat $DEBOOTSTRAP_DIR/arch`
+fi
+HOST_OS="$HOST_ARCH"
+# basic host OS guessing for non-Debian systems
+if [ -z "$HOST_OS" ]; then
+	case `uname` in
+		Linux)
+			HOST_OS=linux
+		;;
+		GNU/kFreeBSD)
+			HOST_OS=kfreebsd
+		;;
+		GNU)
+			HOST_OS=hurd
+		;;
+		FreeBSD*)
+			HOST_OS=freebsd
+		;;
+	esac
+fi
+
+if [ -z "$ARCH" ]; then
+	ARCH=$HOST_ARCH
+fi
+
+if [ -z "$ARCH" ] || [ -z "$HOST_OS" ]; then
+        error 1 WHATARCH "Couldn't work out current architecture"
+
+fi
+
+if [ "$HOST_OS" = "kfreebsd" ] || [ "$HOST_OS" = "freebsd" ]; then
+	for module in "linprocfs fdescfs tmpfs linsysfs"; do
+		kldstat -m "$module" > /dev/null 2>&1 || warning SANITYCHECK "Probably required module %s is not loaded" "$module"
+	done
 fi
 
 if [ "$TARGET" = "/" ]; then
@@ -415,8 +453,7 @@
 if [ -z "$SHA_SIZE" ]; then
 	SHA_SIZE=256
 fi
-if ! [ -x "/usr/bin/sha${SHA_SIZE}sum" ] && \
-   ! [ -x "/bin/sha${SHA_SIZE}sum" ]; then
+if ! in_path "sha${SHA_SIZE}sum" && ! in_path "sha${SHA_SIZE}"; then
 	SHA_SIZE=1
 fi
 DEBOOTSTRAP_CHECKSUM_FIELD="SHA$SHA_SIZE"
@@ -424,7 +461,7 @@
 export ARCH SUITE TARGET CHROOT_CMD SHA_SIZE DEBOOTSTRAP_CHECKSUM_FIELD
 
 if am_doing_phase first_stage second_stage; then
-	if [ -x /usr/bin/id ] && [ `id -u` -ne 0 ]; then
+	if in_path id && [ `id -u` -ne 0 ]; then
 		error 1 NEEDROOT "debootstrap can only run as root"
 	fi
 	# Ensure that we can create working devices and executables on the target.
@@ -456,10 +493,6 @@
 	#    stdout=stderr: full log of debootstrap run
 	#    fd 3: I:/W:/etc information
 	exec 4>&3
-elif [ "$USE_BOOTFLOPPIES_INTERACTION" = yes ]; then
-	#    stdout=stderr: full log of debootstrap run
-	#    fd 3: I:/W:/etc information
-	exec 4>&3
 elif am_doing_phase printdebs; then
 	#    stderr: I:/W:/etc information
 	#    stdout: debs needed
@@ -523,7 +556,7 @@
 
 	work_out_debs
 
-	base=$(without "$base $additional" "$exclude")
+	base=$(without "$base $ADDITIONAL" "$EXCLUDE")
 
 	if [ "$RESOLVE_DEPS" = true ]; then
 		requiredX=$(echo $(echo $required | tr ' ' '\n' | sort | uniq))
@@ -582,6 +615,7 @@
 	if ! am_doing_phase second_stage; then
 		cp "$0"				 "$TARGET/debootstrap/debootstrap"
 		cp $DEBOOTSTRAP_DIR/functions	 "$TARGET/debootstrap/functions"
+		cp $DEBOOTSTRAP_DIR/devices.tar.gz	 "$TARGET/debootstrap/devices.tar.gz"
 		cp $SCRIPT			 "$TARGET/debootstrap/suite-script"
 		echo "$ARCH"			>"$TARGET/debootstrap/arch"
 		echo "$SUITE"			>"$TARGET/debootstrap/suite"
@@ -649,8 +683,3 @@
 		rm -rf "$TARGET"
 	fi
 fi
-
-if [ -n "$USE_BOOTFLOPPIES_INTERACTION" ] ; then
-	echo "I: debootstrap: Successfully completed" # goes to /dev/tty4
-	sleep 1 || true # give the user a second to see the success notice.
-fi
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/debootstrap.8 debootstrap-1.0.37ubuntu1~lucid1/debootstrap.8
--- debootstrap-1.0.29ubuntu1~lucid1/debootstrap.8	2011-03-01 14:13:20.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/debootstrap.8	2011-04-13 13:26:51.000000000 +0000
@@ -25,7 +25,8 @@
 can be an http:// URL, a file:/// URL, or an ssh:/// URL.
 .PP
 The
-.I SUITE may be a release code name (eg, sid, wheeze, squeeze, lenny)
+.I SUITE
+may be a release code name (eg, sid, wheezy, squeeze, lenny)
 or a symbolic name (eg, unstable, testing, stable, oldstable)
 .PP
 Notice that file:/ URLs are translated to file:/// (correct scheme as
@@ -84,9 +85,13 @@
 .IR TARGET .
 .IP
 .IP "\fB\-\-keyring=KEYRING\fP"
-Download signatures for retrieved Release files and check them against
-.IR KEYRING .
-By default, Release file signatures are not checked.
+Override the default keyring for the distribution being bootstrapped,
+and use
+.IR KEYRING
+to check signatures of retrieved Release files.
+.IP
+.IP "\fB\-\-no-check-gpg\fP"
+Disables checking gpg signatures of retrieved Release files.
 .IP
 .IP "\fB\-\-verbose\fP"
 Produce more info about downloading.
@@ -131,9 +136,6 @@
 The resulting tarball may be passed to a later
 .BR \-\-unpack\-tarball .
 .IP
-.IP "\fB\-\-boot\-floppies\fP"
-Used for internal purposes by boot-floppies
-.IP
 .IP "\fB\-\-debian\-installer\fP"
 Used for internal purposes by the debian-installer
 .IP 
@@ -156,28 +158,21 @@
 .PP 
 To setup a \fIwheezy\fR system:
 .PP 
-# debootstrap wheezy ./wheezy-chroot http://ftp.us.debian.org/debian
+     debootstrap wheezy ./wheezy-chroot http://ftp.us.debian.org/debian
 .PP
-# debootstrap wheezy ./wheezy-chroot file:///PATH_TO_LOCAL_MIRROR/debian
+     debootstrap wheezy ./wheezy-chroot file:///LOCAL_MIRROR/debian
 .PP
-Full process to create a complete Debian installation of \fIsid\fR (unstable):
+Full process to create a complete Debian installation of \fIsid\fR (unstable)
+in a chroot:
 .PP
-     main # cd / ; mkdir /sid-root
-     main # debootstrap sid /sid-root http://ftp.us.debian.org/debian/
+     main # debootstrap sid sid-root http://ftp.us.debian.org/debian/
      [ ... watch it download the whole system ]
-     main # echo "proc /sid-root/proc proc defaults 0 0" >> /etc/fstab
-     main # mount proc /sid-root/proc -t proc
-     main # echo "sysfs /sid-root/sys sysfs defaults 0 0" >> /etc/fstab
-     main # mount sysfs /sid-root/sys -t sysfs
-     main # cp /etc/hosts /sid-root/etc/hosts
-     main # chroot /sid-root /bin/bash
-     chroot # dselect  
-     [ you may use aptitude, install mc and vim ... ]
-      main # echo "8:23:respawn:/usr/sbin/chroot /sid-root " \\
-             "/sbin/getty 38400 tty8"  >> /etc/inittab
-     [ define a login tty that will use this system ]
-      main # init q    
-     [ reload init ]
+     main # echo "proc sid-root/proc proc defaults 0 0" >> /etc/fstab
+     main # mount proc sid-root/proc -t proc
+     main # echo "sysfs sid-root/sys sysfs defaults 0 0" >> /etc/fstab
+     main # mount sysfs sid-root/sys -t sysfs
+     main # cp /etc/hosts sid-root/etc/hosts
+     main # chroot sid-root /bin/bash
 .SH AUTHOR
 .B debootstrap
 was written by Anthony Towns <ajt@debian.org>.
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/functions debootstrap-1.0.37ubuntu1~lucid1/functions
--- debootstrap-1.0.29ubuntu1~lucid1/functions	2011-04-13 17:48:07.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/functions	2011-10-05 20:56:28.000000000 +0000
@@ -5,6 +5,19 @@
 	while echo "$YES" 2>/dev/null ; do : ; done
 }
 
+in_path () {
+	local OLD_IFS="$IFS"
+	IFS=":"
+	for dir in $PATH; do
+		if [ -x "$dir/$1" ]; then
+			IFS="$OLD_IFS"
+			return 0
+		fi
+	done
+	IFS="$OLD_IFS"
+	return 1
+}
+
 ############################################################### interaction
 
 error () {
@@ -61,14 +74,11 @@
 }
 
 wgetprogress () {
-	[ ! "$verbose" ] && QSWITCH="-q"
+	[ ! "$VERBOSE" ] && QSWITCH="-q"
 	local ret=0
 	if [ "$USE_DEBIANINSTALLER_INTERACTION" ] && [ "$PROGRESS_NEXT" ]; then
 		wget "$@" 2>&1 >/dev/null | $PKGDETAILS "WGET%" $PROGRESS_NOW $PROGRESS_NEXT $PROGRESS_END >&3
 		ret=$?
-	elif [ "$USE_BOOTFLOPPIES_INTERACTION" ] && [ "$PROGRESS_NEXT" ]; then
-		wget "$@" 2>&1 >/dev/null | $PKGDETAILS "WGET%" $PROGRESS_NOW $PROGRESS_NEXT $PROGRESS_END "$PROGRESS_WHAT" >&3
-		ret=$?
 	else
 		wget $QSWITCH "$@" 
 		ret=$?
@@ -90,12 +100,6 @@
 		(echo "P: $now $end $name"
 		for x in "$@"; do echo "PA: $x"; done
 		echo "PF: $fmt") >&3
-	elif [ "$USE_BOOTFLOPPIES_INTERACTION" ]; then
-		PROGRESS_NOW="$now"
-		PROGRESS_END="$end"
-		PROGRESS_WHAT="`printf "$fmt" "$@"`"
-		PROGRESS_NEXT=""
-		printf "P: %s %s %s\n" $now $end "$PROGRESS_WHAT" >&3
 	fi
 }
 
@@ -191,6 +195,13 @@
 	esac
 }
 
+keyring () {
+	KEYRING_WANTED="$1"
+	if [ -z "$KEYRING" ] && [ -e "$KEYRING_WANTED" ]; then
+		KEYRING="$KEYRING_WANTED"
+	fi
+}
+
 ########################################################## variant handling
 
 doing_variant () {
@@ -228,11 +239,32 @@
 	export DOWNLOAD_DEBS
 }
 
+force_md5 () {
+	DEBOOTSTRAP_CHECKSUM_FIELD=MD5SUM
+	export DEBOOTSTRAP_CHECKSUM_FIELD
+}
+
 verify_checksum () {
 	# args: dest checksum size
 	local expchecksum="$2"
 	local expsize="$3"
-	relchecksum=`sha${SHA_SIZE}sum < "$1" | sed 's/ .*$//'`
+	if [ "$DEBOOTSTRAP_CHECKSUM_FIELD" = "MD5SUM" ]; then
+		if in_path md5sum; then
+			relchecksum=`md5sum < "$1" | sed 's/ .*$//'`
+		elif in_path md5; then
+			relchecksum=`md5 < "$1"`
+		else
+			error 1 SIGCHECK "Cannot check md5sum"
+		fi
+	else
+		if in_path "sha${SHA_SIZE}sum"; then
+			relchecksum=`sha${SHA_SIZE}sum < "$1" | sed 's/ .*$//'`
+		elif in_path "sha${SHA_SIZE}"; then
+			relchecksum=`sha${SHA_SIZE} < "$1"`
+		else
+			error 1 SIGCHECK "Cannot check sha${SHA_SIZE}sum"
+		fi
+	fi
 	relsize=`wc -c < "$1"`
 	if [ "$expsize" -ne "$relsize" ] || [ "$expchecksum" != "$relchecksum" ]; then
 		return 1
@@ -445,7 +477,12 @@
 get_release_checksum () {
 	local reldest="$1"
 	local path="$2"
-	sed -n "/^[Sa][Hh][Aa]$SHA_SIZE:/,/^[^ ]/p" < "$reldest" | \
+	if [ "$DEBOOTSTRAP_CHECKSUM_FIELD" = MD5SUM ]; then
+		local match="^[Mm][Dd]5[Ss][Uu][Mm]"
+	else
+		local match="^[Ss][Hh][Aa]$SHA_SIZE:"
+	fi
+	sed -n "/$match/,/^[^ ]/p" < "$reldest" | \
 		while read a b c; do
 			if [ "$c" = "$path" ]; then echo "$a $b"; fi
 		done | head -n 1
@@ -456,7 +493,7 @@
 	local reldest="$2"
 	local relsigdest="$TARGET/$($DLDEST rel "$SUITE" "$m1" "dists/$SUITE/Release.gpg")"
 
-	if [ -n "$KEYRING" ]; then
+	if [ -n "$KEYRING" ] && [ -z "$DISABLE_KEYRING" ]; then
 		progress 0 100 DOWNRELSIG "Downloading Release file signature"
 		progress_next 50
 		get "$m1/dists/$SUITE/Release.gpg" "$relsigdest" nocache ||
@@ -470,6 +507,8 @@
 		(gpgv --status-fd 1 --keyring "$KEYRING" --ignore-time-conflict \
 		 "$relsigdest" "$reldest" || true) | read_gpg_status
 		progress 100 100 DOWNRELSIG "Downloading Release file signature"
+	elif [ -z "$DISABLE_KEYRING" ] && [ -n "$KEYRING_WANTED" ]; then
+		warning KEYRING "Cannot check Release signature; keyring file not available %s" "$KEYRING_WANTED"
 	fi
 }
 
@@ -510,9 +549,9 @@
 		local i=
 		if [ "$normi" != "" ]; then
 			i="$normi"
-		elif [ -x /bin/bunzip2 ] && [ "$bz2i" != "" ]; then
+		elif in_path bunzip2 && [ "$bz2i" != "" ]; then
 			i="$bz2i"
-		elif [ -x /bin/gunzip ] && [ "$gzi" != "" ]; then
+		elif in_path gunzip && [ "$gzi" != "" ]; then
 			i="$gzi"
 		fi
 		if [ "$i" != "" ]; then
@@ -538,11 +577,11 @@
 			ext="$ext $normi ."
 			i="$normi"
 		fi
-		if [ -x /bin/bunzip2 ] && [ "$bz2i" != "" ]; then
+		if in_path bunzip2 && [ "$bz2i" != "" ]; then
 			ext="$ext $bz2i bz2"
 			i="${i:-$bz2i}"
 		fi
-		if [ -x /bin/gunzip ] && [ "$gzi" != "" ]; then
+		if in_path gunzip && [ "$gzi" != "" ]; then
 			ext="$ext $gzi gz"
 			i="${i:-$gzi}"
 		fi
@@ -598,7 +637,7 @@
 					dloaddebs="$(($dloaddebs + $size))"
 					echo >>$TARGET/debootstrap/debpaths "$p $debdest"
 				else
-					warning COULDNTDL "Couldn't download package %s" "$p"
+					warning COULDNTDL "Couldn't download package %s (ver %s arc %s)" "$p" "$ver" "$arc"
 				fi
 			fi
 		done
@@ -676,7 +715,7 @@
 	    for c in $COMPONENTS; do
 		local path="dists/$SUITE/$c/binary-$ARCH/Packages"
 		local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m" "$path")"
-		if [ -x /bin/gunzip ] && get "$m/${path}.gz" "${pkgdest}.gz"; then
+		if in_path gunzip && get "$m/${path}.gz" "${pkgdest}.gz"; then
 			rm -f "$pkgdest"
 			gunzip "$pkgdest.gz"
 		elif get "$m/$path" "$pkgdest"; then
@@ -779,7 +818,7 @@
 	if type $cat_cmd >/dev/null 2>&1; then
 		ar -p "$pkg" "$tarball" | $cat_cmd | tar -xf -
 	else
-		error 1 UNPACKCMDUNVL "The $cat_cmd is not available on the system"
+		error 1 UNPACKCMDUNVL "The $cat_cmd command is not available on the system"
 	fi
 }
 
@@ -904,7 +943,7 @@
 
 umount_exit_function () {
 	for dir in $UMOUNT_DIRS; do
-		umount "$TARGET/${dir#/}" || true
+		( cd / ; umount "$TARGET/${dir#/}" ) || true
 	done
 }
 
@@ -924,14 +963,18 @@
 }
 
 setup_proc () {
-	case "$ARCH" in
-	    kfreebsd-*)
+	case "$HOST_OS" in
+	    *freebsd*)
 		umount_on_exit /dev
 		umount_on_exit /proc
 		umount "$TARGET/proc" 2>/dev/null || true
-		in_target mount -t linprocfs proc /proc
+		if [ "$HOST_OS" = kfreebsd ]; then
+			in_target mount -t linprocfs proc /proc
+		else
+			mount -t linprocfs proc $TARGET/proc
+		fi
 		;;
-	    hurd-*)
+	    hurd*)
 		;;
 	    *)
 		umount_on_exit /dev/pts
@@ -958,10 +1001,17 @@
 }
 
 setup_devices () {
-	case "$ARCH" in
-	    kfreebsd-*)
+	if doing_variant fakechroot; then
+		setup_devices_fakechroot
+		return 0
+	fi
+
+	case "$HOST_OS" in
+	    kfreebsd*)
 		in_target mount -t devfs devfs /dev ;;
-	    hurd-*)
+	    freebsd)
+		mount -t devfs devfs $TARGET/dev ;;
+	    hurd*)
 		setup_devices_hurd ;;
 	    *)
 		if [ -e "$DEVICES_TARGZ" ]; then
@@ -1009,7 +1059,7 @@
 # For the debootstrap udeb, pkgdetails is provided by the bootstrap-base
 # udeb, so the pkgdetails API needs to be kept in sync with that.
 
-if [ -x /usr/bin/perl ]; then
+if in_path perl; then
 	PKGDETAILS=pkgdetails_perl
 
 	pkgdetails_field () {
@@ -1027,7 +1077,7 @@
 		$ver = $v if ($f eq "version:");
 		$arc = $v if ($f eq "architecture:");
 		$fil = $v if ($f eq "filename:");
-		$chk = $v if ($f eq lc($ENV{DEBOOTSTRAP_CHECKSUM_FIELD}).":");
+		$chk = $v if (lc $f eq lc($ENV{DEBOOTSTRAP_CHECKSUM_FIELD}).":");
 		$siz = $v if ($f eq "size:");
 		$val = $v if ($f eq $field);
 	} elsif (/^$/) {
@@ -1179,8 +1229,8 @@
 check_sane_mount () {
 	mkdir -p "$1"
 
-	case "$ARCH" in
-	    kfreebsd-*|hurd-*)
+	case "$HOST_OS" in
+	    *freebsd*|hurd*)
 		;;
 	    *)
 		mknod "$1/test-dev-null" c 1 3 || return 1
@@ -1276,6 +1326,10 @@
 ############################################################## fakechroot tools
 
 install_fakechroot_tools () {
+	if [ "$VARIANT" = "fakechroot" ]; then
+		export PATH=/usr/sbin:/sbin:$PATH
+	fi
+
 	mv "$TARGET/sbin/ldconfig" "$TARGET/sbin/ldconfig.REAL"
 	echo \
 "#!/bin/sh
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/Makefile debootstrap-1.0.37ubuntu1~lucid1/Makefile
--- debootstrap-1.0.29ubuntu1~lucid1/Makefile	2011-01-20 16:39:31.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/Makefile	2011-08-10 11:59:34.000000000 +0000
@@ -3,7 +3,7 @@
 
 MAKEDEV := /sbin/MAKEDEV
 
-ifneq ($(shell uname),GNU)
+ifeq ($(shell uname),Linux)
 all: devices.tar.gz
 else
 all:
@@ -25,7 +25,7 @@
 	chown root:root $(DESTDIR)/usr/sbin/debootstrap
 	chmod 0755 $(DESTDIR)/usr/sbin/debootstrap
 
-ifneq ($(shell uname),GNU)
+ifeq ($(shell uname),Linux)
 	install -o root -g root -m 0644 devices.tar.gz $(DSDIR)/
 endif
 
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/breezy debootstrap-1.0.37ubuntu1~lucid1/scripts/breezy
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/breezy	2011-03-01 14:16:58.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/breezy	2011-07-29 09:14:35.000000000 +0000
@@ -44,8 +44,6 @@
         chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
     fi
 
-    setup_devices
-
     x_feign_install () {
         local pkg="$1"
         local deb="$(debfor $pkg)"
@@ -73,6 +71,7 @@
 	baseprog="$(($baseprog + ${1:-1}))"
     }
 
+    setup_devices
     setup_proc
     umount_on_exit /dev/.static/dev
     umount_on_exit /dev
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/dapper debootstrap-1.0.37ubuntu1~lucid1/scripts/dapper
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/dapper	2011-03-01 14:16:58.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/dapper	2011-07-29 09:14:35.000000000 +0000
@@ -51,8 +51,6 @@
         chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
     fi
 
-    setup_devices
-
     x_feign_install () {
         local pkg="$1"
         local deb="$(debfor $pkg)"
@@ -80,6 +78,7 @@
 	baseprog="$(($baseprog + ${1:-1}))"
     }
 
+    setup_devices
     setup_proc
     in_target /sbin/ldconfig
 
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/edgy debootstrap-1.0.37ubuntu1~lucid1/scripts/edgy
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/edgy	2011-03-01 14:16:58.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/edgy	2011-07-29 09:14:35.000000000 +0000
@@ -57,12 +57,6 @@
         chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
     fi
 
-    if doing_variant fakechroot; then
-        setup_devices_fakechroot
-    else
-        setup_devices
-    fi
-
     x_feign_install () {
         local pkg="$1"
         local deb="$(debfor $pkg)"
@@ -90,6 +84,8 @@
 	baseprog="$(($baseprog + ${1:-1}))"
     }
 
+    setup_devices
+
     if doing_variant fakechroot; then
 	setup_proc_fakechroot
     else
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/etch debootstrap-1.0.37ubuntu1~lucid1/scripts/etch
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/etch	2011-03-22 10:45:27.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/etch	2011-07-29 09:14:35.000000000 +0000
@@ -2,6 +2,7 @@
 download_style apt
 finddebs_style from-indices
 variants - buildd fakechroot minbase scratchbox
+keyring /usr/share/keyrings/debian-archive-keyring.gpg
 
 if doing_variant fakechroot; then
 	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
@@ -22,7 +23,7 @@
 		#  ^^ should be getting debconf here somehow maybe
 		base="$(get_debs Priority: important)"
 	elif doing_variant buildd || doing_variant scratchbox; then
-		base="apt $(get_debs Build-Essential: yes)"
+		base="apt build-essential"
 	elif doing_variant minbase; then
 		base="apt"
 	fi
@@ -46,12 +47,6 @@
 		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
 	fi
 
-	if doing_variant fakechroot; then
-		setup_devices_fakechroot
-	else
-		setup_devices
-	fi
-
 	x_feign_install () {
 		local pkg="$1"
 		local deb="$(debfor $pkg)"
@@ -72,6 +67,8 @@
 }
 
 second_stage_install () {
+	setup_devices
+
 	x_core_install () {
 		smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
 	}
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/etch-m68k debootstrap-1.0.37ubuntu1~lucid1/scripts/etch-m68k
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/etch-m68k	2011-03-22 10:45:27.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/etch-m68k	2011-07-29 09:14:35.000000000 +0000
@@ -2,6 +2,7 @@
 download_style apt
 finddebs_style from-indices
 variants - buildd fakechroot minbase scratchbox
+keyring /usr/share/keyrings/debian-archive-keyring.gpg
 
 if doing_variant fakechroot; then
 	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
@@ -22,7 +23,7 @@
 		#  ^^ should be getting debconf here somehow maybe
 		base="$(get_debs Priority: important)"
 	elif doing_variant buildd || doing_variant scratchbox; then
-		base="apt $(get_debs Build-Essential: yes)"
+		base="apt build-essential"
 	elif doing_variant minbase; then
 		base="apt"
 	fi
@@ -46,12 +47,6 @@
 		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
 	fi
 
-	if doing_variant fakechroot; then
-		setup_devices_fakechroot
-	else
-		setup_devices
-	fi
-
 	x_feign_install () {
 		local pkg="$1"
 		local deb="$(debfor $pkg)"
@@ -72,6 +67,8 @@
 }
 
 second_stage_install () {
+	setup_devices
+
 	x_core_install () {
 		smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
 	}
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/feisty debootstrap-1.0.37ubuntu1~lucid1/scripts/feisty
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/feisty	2011-03-01 14:16:58.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/feisty	2011-07-29 09:14:35.000000000 +0000
@@ -57,12 +57,6 @@
         chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
     fi
 
-    if doing_variant fakechroot; then
-        setup_devices_fakechroot
-    else
-        setup_devices
-    fi
-
     x_feign_install () {
         local pkg="$1"
         local deb="$(debfor $pkg)"
@@ -90,6 +84,8 @@
 	baseprog="$(($baseprog + ${1:-1}))"
     }
 
+    setup_devices
+
     if doing_variant fakechroot; then
 	setup_proc_fakechroot
     else
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/gutsy debootstrap-1.0.37ubuntu1~lucid1/scripts/gutsy
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/gutsy	2011-03-22 10:45:27.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/gutsy	2011-07-29 09:14:35.000000000 +0000
@@ -20,6 +20,7 @@
 download_style apt
 finddebs_style from-indices
 variants - buildd fakechroot minbase
+keyring /usr/share/keyrings/ubuntu-archive-keyring.gpg
 
 if doing_variant fakechroot; then
 	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
@@ -57,12 +58,6 @@
 		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
 	fi
 
-	if doing_variant fakechroot; then
-		setup_devices_fakechroot
-	else
-		setup_devices
-	fi
-
 	x_feign_install () {
 		local pkg="$1"
 		local deb="$(debfor $pkg)"
@@ -90,6 +85,8 @@
 		baseprog="$(($baseprog + ${1:-1}))"
 	}
 
+    setup_devices
+
 	if doing_variant fakechroot; then
 		setup_proc_fakechroot
 	else
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/hardy debootstrap-1.0.37ubuntu1~lucid1/scripts/hardy
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/hardy	2011-03-22 10:45:27.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/hardy	2011-07-29 09:14:35.000000000 +0000
@@ -20,6 +20,7 @@
 download_style apt
 finddebs_style from-indices
 variants - buildd fakechroot minbase
+keyring /usr/share/keyrings/ubuntu-archive-keyring.gpg
 
 if doing_variant fakechroot; then
 	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
@@ -57,12 +58,6 @@
 		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
 	fi
 
-	if doing_variant fakechroot; then
-		setup_devices_fakechroot
-	else
-		setup_devices
-	fi
-
 	x_feign_install () {
 		local pkg="$1"
 		local deb="$(debfor $pkg)"
@@ -90,6 +85,8 @@
 		baseprog="$(($baseprog + ${1:-1}))"
 	}
 
+    setup_devices
+
 	if doing_variant fakechroot; then
 		setup_proc_fakechroot
 	else
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/hoary debootstrap-1.0.37ubuntu1~lucid1/scripts/hoary
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/hoary	2011-03-01 14:16:58.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/hoary	2011-07-29 09:14:35.000000000 +0000
@@ -65,8 +65,6 @@
         chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
     fi
 
-    setup_devices
-
     x_feign_install () {
         local pkg="$1"
         local deb="$(debfor $pkg)"
@@ -100,6 +98,7 @@
     baseprog=0
     bases=7
 
+    setup_devices
     setup_proc
     umount_on_exit /.dev
     umount_on_exit /dev
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/hoary.buildd debootstrap-1.0.37ubuntu1~lucid1/scripts/hoary.buildd
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/hoary.buildd	2011-03-01 14:16:58.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/hoary.buildd	2011-07-29 09:14:35.000000000 +0000
@@ -61,8 +61,6 @@
         chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
     fi
 
-    setup_devices
-
     x_feign_install () {
         local pkg="$1"
         local deb="$(debfor $pkg)"
@@ -95,6 +93,7 @@
     baseprog=0
     bases=40
 
+    setup_devices
     setup_proc
     in_target /sbin/ldconfig
 
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/intrepid debootstrap-1.0.37ubuntu1~lucid1/scripts/intrepid
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/intrepid	2011-03-22 10:45:27.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/intrepid	2011-07-29 09:14:35.000000000 +0000
@@ -20,6 +20,7 @@
 download_style apt
 finddebs_style from-indices
 variants - buildd fakechroot minbase
+keyring /usr/share/keyrings/ubuntu-archive-keyring.gpg
 
 if doing_variant fakechroot; then
 	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
@@ -57,12 +58,6 @@
 		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
 	fi
 
-	if doing_variant fakechroot; then
-		setup_devices_fakechroot
-	else
-		setup_devices
-	fi
-
 	x_feign_install () {
 		local pkg="$1"
 		local deb="$(debfor $pkg)"
@@ -90,6 +85,8 @@
 		baseprog="$(($baseprog + ${1:-1}))"
 	}
 
+    setup_devices
+
 	if doing_variant fakechroot; then
 		setup_proc_fakechroot
 	else
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/jaunty debootstrap-1.0.37ubuntu1~lucid1/scripts/jaunty
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/jaunty	2011-03-22 10:45:27.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/jaunty	2011-07-29 09:14:35.000000000 +0000
@@ -20,6 +20,7 @@
 download_style apt
 finddebs_style from-indices
 variants - buildd fakechroot minbase
+keyring /usr/share/keyrings/ubuntu-archive-keyring.gpg
 
 if doing_variant fakechroot; then
 	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
@@ -57,12 +58,6 @@
 		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
 	fi
 
-	if doing_variant fakechroot; then
-		setup_devices_fakechroot
-	else
-		setup_devices
-	fi
-
 	x_feign_install () {
 		local pkg="$1"
 		local deb="$(debfor $pkg)"
@@ -90,6 +85,8 @@
 		baseprog="$(($baseprog + ${1:-1}))"
 	}
 
+    setup_devices
+
 	if doing_variant fakechroot; then
 		setup_proc_fakechroot
 	else
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/karmic debootstrap-1.0.37ubuntu1~lucid1/scripts/karmic
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/karmic	2011-03-22 10:45:27.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/karmic	2011-07-29 09:14:35.000000000 +0000
@@ -20,6 +20,7 @@
 download_style apt
 finddebs_style from-indices
 variants - buildd fakechroot minbase
+keyring /usr/share/keyrings/ubuntu-archive-keyring.gpg
 
 if doing_variant fakechroot; then
 	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
@@ -57,12 +58,6 @@
 		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
 	fi
 
-	if doing_variant fakechroot; then
-		setup_devices_fakechroot
-	else
-		setup_devices
-	fi
-
 	x_feign_install () {
 		local pkg="$1"
 		local deb="$(debfor $pkg)"
@@ -90,6 +85,8 @@
 		baseprog="$(($baseprog + ${1:-1}))"
 	}
 
+    setup_devices
+
 	if doing_variant fakechroot; then
 		setup_proc_fakechroot
 	else
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/lenny debootstrap-1.0.37ubuntu1~lucid1/scripts/lenny
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/lenny	2011-03-22 10:45:27.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/lenny	2011-07-29 09:14:35.000000000 +0000
@@ -2,6 +2,7 @@
 download_style apt
 finddebs_style from-indices
 variants - buildd fakechroot minbase scratchbox
+keyring /usr/share/keyrings/debian-archive-keyring.gpg
 
 if doing_variant fakechroot; then
 	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
@@ -22,7 +23,7 @@
 		#  ^^ should be getting debconf here somehow maybe
 		base="$(get_debs Priority: important)"
 	elif doing_variant buildd || doing_variant scratchbox; then
-		base="apt $(get_debs Build-Essential: yes)"
+		base="apt build-essential"
 	elif doing_variant minbase; then
 		base="apt"
 	fi
@@ -46,12 +47,6 @@
 		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
 	fi
 
-	if doing_variant fakechroot; then
-		setup_devices_fakechroot
-	else
-		setup_devices
-	fi
-
 	x_feign_install () {
 		local pkg="$1"
 		local deb="$(debfor $pkg)"
@@ -72,6 +67,8 @@
 }
 
 second_stage_install () {
+	setup_devices
+
 	x_core_install () {
 		smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
 	}
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/lucid debootstrap-1.0.37ubuntu1~lucid1/scripts/lucid
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/lucid	2011-03-22 10:45:27.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/lucid	2011-07-29 09:14:35.000000000 +0000
@@ -20,6 +20,7 @@
 download_style apt
 finddebs_style from-indices
 variants - buildd fakechroot minbase
+keyring /usr/share/keyrings/ubuntu-archive-keyring.gpg
 
 if doing_variant fakechroot; then
 	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
@@ -57,12 +58,6 @@
 		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
 	fi
 
-	if doing_variant fakechroot; then
-		setup_devices_fakechroot
-	else
-		setup_devices
-	fi
-
 	x_feign_install () {
 		local pkg="$1"
 		local deb="$(debfor $pkg)"
@@ -90,6 +85,8 @@
 		baseprog="$(($baseprog + ${1:-1}))"
 	}
 
+    setup_devices
+
 	if doing_variant fakechroot; then
 		setup_proc_fakechroot
 	else
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/maverick debootstrap-1.0.37ubuntu1~lucid1/scripts/maverick
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/maverick	2011-03-22 10:45:27.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/maverick	2011-07-29 09:14:35.000000000 +0000
@@ -20,6 +20,7 @@
 download_style apt
 finddebs_style from-indices
 variants - buildd fakechroot minbase
+keyring /usr/share/keyrings/ubuntu-archive-keyring.gpg
 
 if doing_variant fakechroot; then
 	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
@@ -57,12 +58,6 @@
 		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
 	fi
 
-	if doing_variant fakechroot; then
-		setup_devices_fakechroot
-	else
-		setup_devices
-	fi
-
 	x_feign_install () {
 		local pkg="$1"
 		local deb="$(debfor $pkg)"
@@ -90,6 +85,8 @@
 		baseprog="$(($baseprog + ${1:-1}))"
 	}
 
+    setup_devices
+
 	if doing_variant fakechroot; then
 		setup_proc_fakechroot
 	else
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/natty debootstrap-1.0.37ubuntu1~lucid1/scripts/natty
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/natty	2011-03-22 10:45:27.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/natty	2011-07-29 09:14:35.000000000 +0000
@@ -20,6 +20,7 @@
 download_style apt
 finddebs_style from-indices
 variants - buildd fakechroot minbase
+keyring /usr/share/keyrings/ubuntu-archive-keyring.gpg
 
 if doing_variant fakechroot; then
 	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
@@ -57,12 +58,6 @@
 		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
 	fi
 
-	if doing_variant fakechroot; then
-		setup_devices_fakechroot
-	else
-		setup_devices
-	fi
-
 	x_feign_install () {
 		local pkg="$1"
 		local deb="$(debfor $pkg)"
@@ -90,6 +85,8 @@
 		baseprog="$(($baseprog + ${1:-1}))"
 	}
 
+    setup_devices
+
 	if doing_variant fakechroot; then
 		setup_proc_fakechroot
 	else
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/oldstable debootstrap-1.0.37ubuntu1~lucid1/scripts/oldstable
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/oldstable	2011-03-22 10:45:27.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/oldstable	2011-07-29 09:14:35.000000000 +0000
@@ -2,6 +2,7 @@
 download_style apt
 finddebs_style from-indices
 variants - buildd fakechroot minbase scratchbox
+keyring /usr/share/keyrings/debian-archive-keyring.gpg
 
 if doing_variant fakechroot; then
 	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
@@ -22,7 +23,7 @@
 		#  ^^ should be getting debconf here somehow maybe
 		base="$(get_debs Priority: important)"
 	elif doing_variant buildd || doing_variant scratchbox; then
-		base="apt $(get_debs Build-Essential: yes)"
+		base="apt build-essential"
 	elif doing_variant minbase; then
 		base="apt"
 	fi
@@ -46,12 +47,6 @@
 		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
 	fi
 
-	if doing_variant fakechroot; then
-		setup_devices_fakechroot
-	else
-		setup_devices
-	fi
-
 	x_feign_install () {
 		local pkg="$1"
 		local deb="$(debfor $pkg)"
@@ -72,6 +67,8 @@
 }
 
 second_stage_install () {
+	setup_devices
+
 	x_core_install () {
 		smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
 	}
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/oneiric debootstrap-1.0.37ubuntu1~lucid1/scripts/oneiric
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/oneiric	2011-03-22 10:45:27.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/oneiric	2011-07-29 09:14:35.000000000 +0000
@@ -20,6 +20,7 @@
 download_style apt
 finddebs_style from-indices
 variants - buildd fakechroot minbase
+keyring /usr/share/keyrings/ubuntu-archive-keyring.gpg
 
 if doing_variant fakechroot; then
 	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
@@ -57,12 +58,6 @@
 		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
 	fi
 
-	if doing_variant fakechroot; then
-		setup_devices_fakechroot
-	else
-		setup_devices
-	fi
-
 	x_feign_install () {
 		local pkg="$1"
 		local deb="$(debfor $pkg)"
@@ -90,6 +85,8 @@
 		baseprog="$(($baseprog + ${1:-1}))"
 	}
 
+    setup_devices
+
 	if doing_variant fakechroot; then
 		setup_proc_fakechroot
 	else
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/potato debootstrap-1.0.37ubuntu1~lucid1/scripts/potato
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/potato	2011-03-01 14:16:58.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/potato	2011-07-29 09:14:35.000000000 +0000
@@ -1,5 +1,6 @@
 mirror_style release
 download_style apt var-state
+force_md5
 
 LIBC=libc6
 if [ "$ARCH" = alpha ]; then
@@ -38,8 +39,6 @@
     echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab"
     chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
 
-    setup_devices
-
     x_feign_install () {
         local pkg=$1
         local deb="$(debfor $pkg)"
@@ -72,6 +71,7 @@
 
     export DEBIAN_FRONTEND=Noninteractive
 
+    setup_devices
     setup_proc
     ln "$TARGET/sbin/ldconfig.new" "$TARGET/sbin/ldconfig"
     in_target /sbin/ldconfig
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/precise debootstrap-1.0.37ubuntu1~lucid1/scripts/precise
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/precise	1970-01-01 00:00:00.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/precise	2011-07-29 09:14:35.000000000 +0000
@@ -0,0 +1,214 @@
+case $ARCH in
+  amd64|i386)
+	default_mirror http://archive.ubuntu.com/ubuntu
+	;;
+  sparc)
+	case $SUITE in
+	  gutsy)
+	default_mirror http://archive.ubuntu.com/ubuntu
+	;;
+	  *)
+	default_mirror http://ports.ubuntu.com/ubuntu-ports
+	;;
+	esac
+	;;
+  *)
+	default_mirror http://ports.ubuntu.com/ubuntu-ports
+	;;
+esac
+mirror_style release
+download_style apt
+finddebs_style from-indices
+variants - buildd fakechroot minbase
+keyring /usr/share/keyrings/ubuntu-archive-keyring.gpg
+
+if doing_variant fakechroot; then
+	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
+fi
+
+case $ARCH in
+	alpha|ia64) LIBC="libc6.1" ;;
+	*)          LIBC="libc6" ;;
+esac
+
+work_out_debs () {
+	required="$(get_debs Priority: required)"
+
+	if doing_variant -; then
+		#required="$required $(get_debs Priority: important)"
+		#  ^^ should be getting debconf here somehow maybe
+		base="$(get_debs Priority: important)"
+	elif doing_variant buildd; then
+		base="$(get_debs Build-Essential: yes)"
+	elif doing_variant fakechroot || doing_variant minbase; then
+		base="apt"
+	fi
+}
+
+first_stage_install () {
+	extract $required
+
+	mkdir -p "$TARGET/var/lib/dpkg"
+	: >"$TARGET/var/lib/dpkg/status"
+	: >"$TARGET/var/lib/dpkg/available"
+
+	setup_etc
+	if [ ! -e "$TARGET/etc/fstab" ]; then
+		echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab"
+		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
+	fi
+
+	x_feign_install () {
+		local pkg="$1"
+		local deb="$(debfor $pkg)"
+		local ver="$(extract_deb_field "$TARGET/$deb" Version)"
+
+		mkdir -p "$TARGET/var/lib/dpkg/info"
+
+		echo \
+"Package: $pkg
+Version: $ver
+Status: install ok installed" >> "$TARGET/var/lib/dpkg/status"
+
+		touch "$TARGET/var/lib/dpkg/info/${pkg}.list"
+	}
+
+	x_feign_install dpkg
+}
+
+second_stage_install () {
+	x_core_install () {
+		smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
+	}
+
+	p () {
+		baseprog="$(($baseprog + ${1:-1}))"
+	}
+
+    setup_devices
+
+	if doing_variant fakechroot; then
+		setup_proc_fakechroot
+	else
+		setup_proc
+		in_target /sbin/ldconfig
+	fi
+
+	DEBIAN_FRONTEND=noninteractive
+	DEBCONF_NONINTERACTIVE_SEEN=true
+	export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN
+
+	baseprog=0
+	bases=7
+
+	p; progress $baseprog $bases INSTCORE "Installing core packages" #1
+	info INSTCORE "Installing core packages..."
+
+	p; progress $baseprog $bases INSTCORE "Installing core packages" #2
+	ln -sf mawk "$TARGET/usr/bin/awk"
+	x_core_install base-files base-passwd
+	p; progress $baseprog $bases INSTCORE "Installing core packages" #3
+	x_core_install dpkg
+
+	if [ ! -e "$TARGET/etc/localtime" ]; then
+		ln -sf /usr/share/zoneinfo/Etc/UTC "$TARGET/etc/localtime"
+	fi
+
+	if doing_variant fakechroot; then
+		install_fakechroot_tools
+	fi
+
+	p; progress $baseprog $bases INSTCORE "Installing core packages" #4
+	x_core_install $LIBC
+
+	p; progress $baseprog $bases INSTCORE "Installing core packages" #5
+	x_core_install perl-base
+
+	p; progress $baseprog $bases INSTCORE "Installing core packages" #6
+	rm "$TARGET/usr/bin/awk"
+	x_core_install mawk
+
+	p; progress $baseprog $bases INSTCORE "Installing core packages" #7
+	if doing_variant -; then
+		x_core_install debconf
+	fi
+
+	baseprog=0
+	bases=$(set -- $required; echo $#)
+
+	info UNPACKREQ "Unpacking required packages..."
+
+	smallyes '' |
+		(repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
+		dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 |
+		dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1
+
+	info CONFREQ "Configuring required packages..."
+
+	if doing_variant fakechroot; then
+	# fix initscripts postinst (no mounting possible, and wrong if condition)
+	sed -i '/dpkg.*--compare-versions/ s/\<lt\>/lt-nl/' "$TARGET/var/lib/dpkg/info/initscripts.postinst"
+	fi
+
+	mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL"
+	echo \
+"#!/bin/sh
+echo
+echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon"
+	chmod 755 "$TARGET/sbin/start-stop-daemon"
+
+	if [ -x "$TARGET/sbin/initctl" ]; then
+	  mv "$TARGET/sbin/initctl" "$TARGET/sbin/initctl.REAL"
+	  echo \
+"#!/bin/sh
+echo
+echo \"Warning: Fake initctl called, doing nothing\"" > "$TARGET/sbin/initctl"
+	  chmod 755 "$TARGET/sbin/initctl"
+	fi
+
+	setup_dselect_method apt
+
+	smallyes '' |
+		(in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \
+		dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 |
+		dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1
+
+	baseprog=0
+	bases="$(set -- $base; echo $#)"
+
+	info UNPACKBASE "Unpacking the base system..."
+
+	setup_available $required $base
+	done_predeps=
+	while predep=$(get_next_predep); do
+		# We have to resolve dependencies of pre-dependencies manually because
+		# dpkg --predep-package doesn't handle this.
+		predep=$(without "$(without "$(resolve_deps $predep)" "$required")" "$done_predeps")
+		# XXX: progress is tricky due to how dpkg_progress works
+		# -- cjwatson 2009-07-29
+		p; smallyes '' |
+		in_target dpkg --force-overwrite --force-confold --skip-same-version --install $(debfor $predep)
+		base=$(without "$base" "$predep")
+		done_predeps="$done_predeps $predep"
+	done
+
+	smallyes '' |
+		(repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
+		dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 |
+		dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1
+
+	info CONFBASE "Configuring the base system..."
+
+	smallyes '' |
+		(repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be re-attempted up to five times." "" \
+		dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 |
+		dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1
+
+	if [ -x "$TARGET/sbin/initctl.REAL" ]; then
+		mv "$TARGET/sbin/initctl.REAL" "$TARGET/sbin/initctl"
+	fi
+	mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon"
+
+	progress $bases $bases CONFBASE "Configuring base system"
+	info BASESUCCESS "Base system installed successfully."
+}
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/sarge debootstrap-1.0.37ubuntu1~lucid1/scripts/sarge
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/sarge	2011-03-01 14:16:58.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/sarge	2011-07-29 09:14:35.000000000 +0000
@@ -1,5 +1,6 @@
 mirror_style release
 download_style apt
+force_md5
 
 LIBC=libc6
 if [ "$ARCH" = "alpha" ] || [ "$ARCH" = "ia64" ]; then
@@ -106,8 +107,6 @@
         chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
     fi
 
-    setup_devices
-
     x_feign_install () {
         local pkg="$1"
         local deb="$(debfor $pkg)"
@@ -135,6 +134,7 @@
 	baseprog="$(($baseprog + ${1:-1}))"
     }
 
+    setup_devices
     setup_proc
     in_target /sbin/ldconfig
 
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/sarge.buildd debootstrap-1.0.37ubuntu1~lucid1/scripts/sarge.buildd
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/sarge.buildd	2011-03-01 14:16:58.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/sarge.buildd	2011-07-29 09:14:35.000000000 +0000
@@ -1,5 +1,6 @@
 mirror_style release
 download_style apt
+force_md5
 
 LIBC=libc6
 if [ "$ARCH" = "alpha" ] || [ "$ARCH" = "ia64" ]; then
@@ -67,8 +68,6 @@
         chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
     fi
 
-    setup_devices
-
     x_feign_install () {
         local pkg="$1"
         local deb="$(debfor $pkg)"
@@ -96,6 +95,7 @@
 	baseprog="$(($baseprog + ${1:-1}))"
     }
 
+    setup_devices
     setup_proc
     in_target /sbin/ldconfig
 
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/sarge.fakechroot debootstrap-1.0.37ubuntu1~lucid1/scripts/sarge.fakechroot
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/sarge.fakechroot	2011-03-01 14:16:58.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/sarge.fakechroot	2011-07-29 09:14:35.000000000 +0000
@@ -2,6 +2,7 @@
 
 mirror_style release
 download_style apt
+force_md5
 
 LIBC=libc6
 if [ "$ARCH" = "alpha" ] || [ "$ARCH" = "ia64" ]; then
@@ -72,8 +73,6 @@
         chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
     fi
 
-    setup_devices_fakechroot
-
     x_feign_install () {
         local pkg="$1"
         local deb="$(debfor $pkg)"
@@ -101,6 +100,7 @@
 	baseprog="$(($baseprog + ${1:-1}))"
     }
 
+    setup_devices_fakechroot
     setup_proc_fakechroot
 
     DEBIAN_FRONTEND=noninteractive
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/sid debootstrap-1.0.37ubuntu1~lucid1/scripts/sid
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/sid	2011-03-22 10:45:27.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/sid	2011-07-29 09:14:35.000000000 +0000
@@ -2,6 +2,7 @@
 download_style apt
 finddebs_style from-indices
 variants - buildd fakechroot minbase scratchbox
+keyring /usr/share/keyrings/debian-archive-keyring.gpg
 
 if doing_variant fakechroot; then
 	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
@@ -22,7 +23,7 @@
 		#  ^^ should be getting debconf here somehow maybe
 		base="$(get_debs Priority: important)"
 	elif doing_variant buildd || doing_variant scratchbox; then
-		base="apt $(get_debs Build-Essential: yes)"
+		base="apt build-essential"
 	elif doing_variant minbase; then
 		base="apt"
 	fi
@@ -46,12 +47,6 @@
 		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
 	fi
 
-	if doing_variant fakechroot; then
-		setup_devices_fakechroot
-	else
-		setup_devices
-	fi
-
 	x_feign_install () {
 		local pkg="$1"
 		local deb="$(debfor $pkg)"
@@ -72,6 +67,8 @@
 }
 
 second_stage_install () {
+	setup_devices
+
 	x_core_install () {
 		smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
 	}
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/squeeze debootstrap-1.0.37ubuntu1~lucid1/scripts/squeeze
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/squeeze	2011-03-22 10:45:27.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/squeeze	2011-07-29 09:14:35.000000000 +0000
@@ -2,6 +2,7 @@
 download_style apt
 finddebs_style from-indices
 variants - buildd fakechroot minbase scratchbox
+keyring /usr/share/keyrings/debian-archive-keyring.gpg
 
 if doing_variant fakechroot; then
 	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
@@ -22,7 +23,7 @@
 		#  ^^ should be getting debconf here somehow maybe
 		base="$(get_debs Priority: important)"
 	elif doing_variant buildd || doing_variant scratchbox; then
-		base="apt $(get_debs Build-Essential: yes)"
+		base="apt build-essential"
 	elif doing_variant minbase; then
 		base="apt"
 	fi
@@ -46,12 +47,6 @@
 		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
 	fi
 
-	if doing_variant fakechroot; then
-		setup_devices_fakechroot
-	else
-		setup_devices
-	fi
-
 	x_feign_install () {
 		local pkg="$1"
 		local deb="$(debfor $pkg)"
@@ -72,6 +67,8 @@
 }
 
 second_stage_install () {
+	setup_devices
+
 	x_core_install () {
 		smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
 	}
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/stable debootstrap-1.0.37ubuntu1~lucid1/scripts/stable
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/stable	2011-03-22 10:45:27.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/stable	2011-07-29 09:14:35.000000000 +0000
@@ -2,6 +2,7 @@
 download_style apt
 finddebs_style from-indices
 variants - buildd fakechroot minbase scratchbox
+keyring /usr/share/keyrings/debian-archive-keyring.gpg
 
 if doing_variant fakechroot; then
 	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
@@ -22,7 +23,7 @@
 		#  ^^ should be getting debconf here somehow maybe
 		base="$(get_debs Priority: important)"
 	elif doing_variant buildd || doing_variant scratchbox; then
-		base="apt $(get_debs Build-Essential: yes)"
+		base="apt build-essential"
 	elif doing_variant minbase; then
 		base="apt"
 	fi
@@ -46,12 +47,6 @@
 		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
 	fi
 
-	if doing_variant fakechroot; then
-		setup_devices_fakechroot
-	else
-		setup_devices
-	fi
-
 	x_feign_install () {
 		local pkg="$1"
 		local deb="$(debfor $pkg)"
@@ -72,6 +67,8 @@
 }
 
 second_stage_install () {
+	setup_devices
+
 	x_core_install () {
 		smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
 	}
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/testing debootstrap-1.0.37ubuntu1~lucid1/scripts/testing
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/testing	2011-03-22 10:45:27.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/testing	2011-07-29 09:14:35.000000000 +0000
@@ -2,6 +2,7 @@
 download_style apt
 finddebs_style from-indices
 variants - buildd fakechroot minbase scratchbox
+keyring /usr/share/keyrings/debian-archive-keyring.gpg
 
 if doing_variant fakechroot; then
 	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
@@ -22,7 +23,7 @@
 		#  ^^ should be getting debconf here somehow maybe
 		base="$(get_debs Priority: important)"
 	elif doing_variant buildd || doing_variant scratchbox; then
-		base="apt $(get_debs Build-Essential: yes)"
+		base="apt build-essential"
 	elif doing_variant minbase; then
 		base="apt"
 	fi
@@ -46,12 +47,6 @@
 		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
 	fi
 
-	if doing_variant fakechroot; then
-		setup_devices_fakechroot
-	else
-		setup_devices
-	fi
-
 	x_feign_install () {
 		local pkg="$1"
 		local deb="$(debfor $pkg)"
@@ -72,6 +67,8 @@
 }
 
 second_stage_install () {
+	setup_devices
+
 	x_core_install () {
 		smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
 	}
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/unstable debootstrap-1.0.37ubuntu1~lucid1/scripts/unstable
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/unstable	2011-03-22 10:45:27.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/unstable	2011-07-29 09:14:35.000000000 +0000
@@ -2,6 +2,7 @@
 download_style apt
 finddebs_style from-indices
 variants - buildd fakechroot minbase scratchbox
+keyring /usr/share/keyrings/debian-archive-keyring.gpg
 
 if doing_variant fakechroot; then
 	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
@@ -22,7 +23,7 @@
 		#  ^^ should be getting debconf here somehow maybe
 		base="$(get_debs Priority: important)"
 	elif doing_variant buildd || doing_variant scratchbox; then
-		base="apt $(get_debs Build-Essential: yes)"
+		base="apt build-essential"
 	elif doing_variant minbase; then
 		base="apt"
 	fi
@@ -46,12 +47,6 @@
 		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
 	fi
 
-	if doing_variant fakechroot; then
-		setup_devices_fakechroot
-	else
-		setup_devices
-	fi
-
 	x_feign_install () {
 		local pkg="$1"
 		local deb="$(debfor $pkg)"
@@ -72,6 +67,8 @@
 }
 
 second_stage_install () {
+	setup_devices
+
 	x_core_install () {
 		smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
 	}
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/warty debootstrap-1.0.37ubuntu1~lucid1/scripts/warty
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/warty	2011-03-01 14:16:58.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/warty	2011-07-29 09:14:35.000000000 +0000
@@ -53,8 +53,6 @@
         chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
     fi
 
-    setup_devices
-
     x_feign_install () {
         local pkg="$1"
         local deb="$(debfor $pkg)"
@@ -86,6 +84,7 @@
     DEBCONF_NONINTERACTIVE_SEEN=true
     export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN
 
+    setup_devices
     setup_proc
     in_target /sbin/ldconfig
 
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/warty.buildd debootstrap-1.0.37ubuntu1~lucid1/scripts/warty.buildd
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/warty.buildd	2011-03-01 14:16:58.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/warty.buildd	2011-07-29 09:14:35.000000000 +0000
@@ -61,8 +61,6 @@
         chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
     fi
 
-    setup_devices
-
     x_feign_install () {
         local pkg="$1"
         local deb="$(debfor $pkg)"
@@ -95,6 +93,7 @@
     baseprog=0
     bases=40
 
+    setup_devices
     setup_proc
     in_target /sbin/ldconfig
 
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/wheezy debootstrap-1.0.37ubuntu1~lucid1/scripts/wheezy
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/wheezy	2011-03-22 10:45:27.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/wheezy	2011-07-29 09:14:35.000000000 +0000
@@ -2,6 +2,7 @@
 download_style apt
 finddebs_style from-indices
 variants - buildd fakechroot minbase scratchbox
+keyring /usr/share/keyrings/debian-archive-keyring.gpg
 
 if doing_variant fakechroot; then
 	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
@@ -22,7 +23,7 @@
 		#  ^^ should be getting debconf here somehow maybe
 		base="$(get_debs Priority: important)"
 	elif doing_variant buildd || doing_variant scratchbox; then
-		base="apt $(get_debs Build-Essential: yes)"
+		base="apt build-essential"
 	elif doing_variant minbase; then
 		base="apt"
 	fi
@@ -46,12 +47,6 @@
 		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
 	fi
 
-	if doing_variant fakechroot; then
-		setup_devices_fakechroot
-	else
-		setup_devices
-	fi
-
 	x_feign_install () {
 		local pkg="$1"
 		local deb="$(debfor $pkg)"
@@ -72,6 +67,8 @@
 }
 
 second_stage_install () {
+	setup_devices
+
 	x_core_install () {
 		smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
 	}
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/woody debootstrap-1.0.37ubuntu1~lucid1/scripts/woody
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/woody	2011-03-01 14:16:58.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/woody	2011-07-29 09:14:35.000000000 +0000
@@ -1,5 +1,6 @@
 mirror_style release
 download_style apt
+force_md5
 
 LIBC=libc6
 if [ "$ARCH" = "alpha" ] || [ "$ARCH" = "ia64" ]; then
@@ -92,8 +93,6 @@
         chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
     fi
 
-    setup_devices
-
     x_feign_install () {
         local pkg="$1"
         local deb="$(debfor $pkg)"
@@ -121,6 +120,7 @@
 	baseprog="$(($baseprog + ${1:-1}))"
     }
 
+    setup_devices
     setup_proc
     in_target /sbin/ldconfig
 
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/scripts/woody.buildd debootstrap-1.0.37ubuntu1~lucid1/scripts/woody.buildd
--- debootstrap-1.0.29ubuntu1~lucid1/scripts/woody.buildd	2011-03-01 14:16:58.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/scripts/woody.buildd	2011-07-29 09:14:35.000000000 +0000
@@ -1,5 +1,6 @@
 mirror_style release
 download_style apt
+force_md5
 
 LIBC=libc6
 if [ "$ARCH" = "alpha" ] || [ "$ARCH" = "ia64" ]; then
@@ -67,8 +68,6 @@
         chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
     fi
 
-    setup_devices
-
     x_feign_install () {
         local pkg="$1"
         local deb="$(debfor $pkg)"
@@ -96,6 +95,7 @@
 	baseprog="$(($baseprog + ${1:-1}))"
     }
 
+    setup_devices
     setup_proc
     in_target /sbin/ldconfig
 
diff -Nru debootstrap-1.0.29ubuntu1~lucid1/TODO debootstrap-1.0.37ubuntu1~lucid1/TODO
--- debootstrap-1.0.29ubuntu1~lucid1/TODO	2011-01-18 00:13:28.000000000 +0000
+++ debootstrap-1.0.37ubuntu1~lucid1/TODO	2011-04-13 13:26:51.000000000 +0000
@@ -8,13 +8,4 @@
       -- support for sources (vs mirrors)
       -- faux-pinning for packages 
 
-  ++ merge variants into single script (optionally anyway)
   ++ makedev in second stage
-  ++ awk/perl pkgdetails
-  ++ granular dpkg progress bar
-  ++ determine required/base dynamically
-      ++ store required/base in $T/debootstrap for two-stage installs
-
-Packages format:
-  std: Priority: required + Priority: important
-  buildd: Priority: required + Build-Essential: yes