From: Faidon Liambotis <paravoid@debian.org>
Date: Sat, 17 Mar 2012 20:41:50 +0000 (+0200)
Subject: dchroot: revert OBSOLETE tags, keep steps for dchroot
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=da7b363fedb0804ed7f7983b4b88900b8679ab8f;p=mirror%2Fdsa-wiki.git

dchroot: revert OBSOLETE tags, keep steps for dchroot

We still use dchroot in some places, so leave the instruction for those there
and tag appropriately the differences in steps for schroot/dchroot.
---

diff --git a/input/howto/dchroot.creole b/input/howto/dchroot.creole
index 2f6c783..59403a1 100644
--- a/input/howto/dchroot.creole
+++ b/input/howto/dchroot.creole
@@ -72,7 +72,7 @@ EOF
 #   least "en_US.UTF-8 UTF-8" and "en_US ISO-8859-1".)
 #
 #*) setup nsswitch.conf to properly use the ldap stuff
-  # OBSOLETE: apt-get install libnss-db &&
+  # [dchroot]: 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/' \
@@ -102,7 +102,7 @@ EOF
   exit
 }}}
 
-* OBSOLETE: edit /etc/fstab on the system root and add entries to mount /proc and /home
+* [dchroot only] edit /etc/fstab on the system root and add entries to mount /proc and /home
 in the chroot, there will be existing ones for the other chroots, just copy and
 adjust. Then mount them (from the system root).
 {{{
@@ -128,14 +128,12 @@ adjust. Then mount them (from the system root).
   :  tmp /srv/albeniz.debian.org/chroot/sid/tmp none bind,defaults
 }}}
 
-* set up /etc/schroot/chroot.d/ correctly.  OBSOLETE: edit /etc/dchroot.conf in the system root, add an entry for $DIST, and
-update the stable and testing pointers
+* [schroot] set up /etc/schroot/chroot.d/ correctly.
+  [dchroot]: edit /etc/dchroot.conf in the system root, add an entry for $DIST, and update the stable and testing pointers
 
-* OBSOLETE: run ud-replicate so the new chroot is setup (this would happen via cron eventually, this is just to speed things up)
+* [dchroot]: run ud-replicate so the new chroot is setup (this would happen via cron eventually, this is just to speed things up)
 {{{
   ud-replicate
 }}}
 
-* as a normal user, test that the new chroot works: "dchroot $DIST", test that the stable and testing pointers work.
-
--- taggart 2007,  slightly modified by weasel 2007, 2008, ported to wiki 2010.
+* as a normal user, test that the new chroot works: "dchroot $DIST" or "schroot $DIST", test that the stable and testing pointers work.