From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 30 Jul 2010 14:50:03 +0000 (+0200)
Subject: wiki fixes, and debootstrap is now stupid
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-wiki.git;a=commitdiff_plain;h=39a17b643f333c340382aaba17a4b2efad78b06d

wiki fixes, and debootstrap is now stupid
---

diff --git a/input/howto/dchroot.creole b/input/howto/dchroot.creole
index 1f38d61..a543ac4 100644
--- a/input/howto/dchroot.creole
+++ b/input/howto/dchroot.creole
@@ -16,7 +16,7 @@ Do the following as root:
 {{{
   cd /srv/chroot &&
   mkdir $DIST &&
-  debootstrap --keyring /usr/share/keyrings/debian-archive-keyring.gpg --variant=buildd $DIST ./$DIST http://$MIRROR/debian &&
+  debootstrap --keyring /usr/share/keyrings/debian-archive-keyring.gpg --include="apt" --variant=buildd $DIST ./$DIST http://$MIRROR/debian &&
   cp /etc/hosts $DIST/etc/
 }}} 
 
@@ -73,9 +73,9 @@ EOF
 #
 #*) setup nsswitch.conf to properly use the ldap stuff
   apt-get install libnss-db &&
-  sed -i -e 's/^passwd:[[:space:]]\+compat$/passwd:         compat db/;
-             s/^group:[[:space:]]\+compat$/group:          db compat/;
-             s/^shadow:[[:space:]]\+compat$/shadow:         compat db/' \
+  sed -i -e 's/^passwd:\[[:space:]]\+compat$/passwd:         compat db/;
+             s/^group:\[[:space:]]\+compat$/group:          db compat/;
+             s/^shadow:\[[:space:]]\+compat$/shadow:         compat db/' \
     /etc/nsswitch.conf
 #
 #