Merge branch 'master' of ssh://db.debian.org/git/dsa-wiki

* 'master' of ssh://db.debian.org/git/dsa-wiki:
  Revert "automatic index generation"
  automatic index generation
  Revert "automatic index generation"
  automatic index generation
  add suggested change from kalle to breadcrumb
  move style.css to dsa.css
  add style.css
  Some init
  update documentation
  some more intro text

diff --git a/input/howto/dchroot.creole b/input/howto/dchroot.creole
index 1f38d61..a543ac4 100644 (file)
--- 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
 #
 #