X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fdchroot.creole;h=a543ac47113f6bda9dac218c8a01fad38c64e4c9;hb=4fae6a459ad0028516f6fbcd5fff4a45ff9de96d;hp=5f9634f5c532dce1ed98b95a22a9e5cb135cebb7;hpb=61672cc2abf59665a68c632440508b42a73d08d1;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/dchroot.creole b/input/howto/dchroot.creole
index 5f9634f..a543ac4 100644
--- a/input/howto/dchroot.creole
+++ b/input/howto/dchroot.creole
@@ -7,17 +7,17 @@ adjust accordingly.
 Do the following as root:
 
 {{{
-	echo -n 'Dist: ' && read DIST && export DIST &&
-	echo -n 'Mirror: ' && read MIRROR && export MIRROR 
+  echo -n 'Dist: ' && read DIST && export DIST &&
+  echo -n 'Mirror: ' && read MIRROR && export MIRROR 
 }}}
 
 
 * create the chroot
 {{{
-	cd /srv/chroot &&
-	mkdir $DIST &&
-	debootstrap --keyring /usr/share/keyrings/debian-archive-keyring.gpg --variant=buildd $DIST ./$DIST http://$MIRROR/debian &&
-	cp /etc/hosts $DIST/etc/
+  cd /srv/chroot &&
+  mkdir $DIST &&
+  debootstrap --keyring /usr/share/keyrings/debian-archive-keyring.gpg --include="apt" --variant=buildd $DIST ./$DIST http://$MIRROR/debian &&
+  cp /etc/hosts $DIST/etc/
 }}} 
 
 * enter the chroot and create the chroot tag:
@@ -26,7 +26,7 @@ chroot $DIST
 echo $DIST > /etc/debian_chroot
 
 # change root's .bashrc:
- patch /root/.bashrc << 'EOF'
+ grep -q debian.chroot /etc/bash.bashrc || patch /root/.bashrc << 'EOF'
 @@ -3,2 +3,6 @@
  export PS1='\h:\w\$ '
 +if [ -e /etc/debian_chroot ]; then
@@ -52,14 +52,14 @@ EOF
 # Copyright (c) 2007 Peter Palfrader <peter@palfrader.org>
 
 while true; do
-    case "$1" in
-	-*)         shift ;;
-	makedev)    exit 0;;
-	*)
-	    echo "Not running services in chroot."
-	    exit 101
-	    ;;
-    esac
+  case "$1" in
+    -*)         shift ;;
+    makedev)    exit 0;;
+    *)
+      echo "Not running services in chroot."
+      exit 101
+      ;;
+  esac
 done
 EOF
  chmod +x /usr/local/sbin/policy-rc.d
@@ -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
 #
 #
@@ -106,26 +106,26 @@ EOF
 in the chroot, there will be existing ones for the other chroots, just copy and
 adjust. Then mount them (from the system root).
 {{{
-	:e.g:
-	:	proc-etch  /srv/albeniz.debian.org/chroot/etch/proc proc defaults,nosuid,nodev,noexec 0 0
-	:	proc-lenny /srv/albeniz.debian.org/chroot/lenny/proc proc defaults,nosuid,nodev,noexec 0 0
-	:	proc-sid   /srv/albeniz.debian.org/chroot/sid/proc proc defaults,nosuid,nodev,noexec 0 0
-	:
-	:	home /srv/albeniz.debian.org/chroot/etch/home none bind,defaults
-	:	home /srv/albeniz.debian.org/chroot/lenny/home none bind,defaults
-	:	home /srv/albeniz.debian.org/chroot/sid/home none bind,defaults
-	:
-	:	devpts-etch  /srv/albeniz.debian.org/chroot/etch/dev/pts devpts defaults,noexec,nosuid 0 0
-	:	devpts-lenny /srv/albeniz.debian.org/chroot/lenny/dev/pts devpts defaults,noexec,nosuid 0 0
-	:	devpts-sid   /srv/albeniz.debian.org/chroot/sid/dev/pts devpts defaults,noexec,nosuid 0 0
-	:
-	:	shm-etch  /srv/albeniz.debian.org/chroot/etch/dev/shm tmpfs defaults,nosuid,nodev 0 0
-	:	shm-lenny /srv/albeniz.debian.org/chroot/lenny/dev/shm tmpfs defaults,nosuid,nodev 0 0
-	:	shm-sid   /srv/albeniz.debian.org/chroot/sid/dev/shm tmpfs defaults,nosuid,nodev 0 0
-	:
-	:	tmp /srv/albeniz.debian.org/chroot/etch/tmp none bind,defaults
-	:	tmp /srv/albeniz.debian.org/chroot/lenny/tmp none bind,defaults
-	:	tmp /srv/albeniz.debian.org/chroot/sid/tmp none bind,defaults
+  :e.g:
+  :  proc-etch  /srv/albeniz.debian.org/chroot/etch/proc proc defaults,nosuid,nodev,noexec 0 0
+  :  proc-lenny /srv/albeniz.debian.org/chroot/lenny/proc proc defaults,nosuid,nodev,noexec 0 0
+  :  proc-sid   /srv/albeniz.debian.org/chroot/sid/proc proc defaults,nosuid,nodev,noexec 0 0
+  :
+  :  home /srv/albeniz.debian.org/chroot/etch/home none bind,defaults
+  :  home /srv/albeniz.debian.org/chroot/lenny/home none bind,defaults
+  :  home /srv/albeniz.debian.org/chroot/sid/home none bind,defaults
+  :
+  :  devpts-etch  /srv/albeniz.debian.org/chroot/etch/dev/pts devpts defaults,noexec,nosuid 0 0
+  :  devpts-lenny /srv/albeniz.debian.org/chroot/lenny/dev/pts devpts defaults,noexec,nosuid 0 0
+  :  devpts-sid   /srv/albeniz.debian.org/chroot/sid/dev/pts devpts defaults,noexec,nosuid 0 0
+  :
+  :  shm-etch  /srv/albeniz.debian.org/chroot/etch/dev/shm tmpfs defaults,nosuid,nodev 0 0
+  :  shm-lenny /srv/albeniz.debian.org/chroot/lenny/dev/shm tmpfs defaults,nosuid,nodev 0 0
+  :  shm-sid   /srv/albeniz.debian.org/chroot/sid/dev/shm tmpfs defaults,nosuid,nodev 0 0
+  :
+  :  tmp /srv/albeniz.debian.org/chroot/etch/tmp none bind,defaults
+  :  tmp /srv/albeniz.debian.org/chroot/lenny/tmp none bind,defaults
+  :  tmp /srv/albeniz.debian.org/chroot/sid/tmp none bind,defaults
 }}}
 
 * edit /etc/dchroot.conf in the system root, add an entry for $DIST, and
@@ -133,7 +133,7 @@ update the stable and testing pointers
 
 * run ud-replicate so the new chroot is setup (this would happen via cron eventually, this is just to speed things up)
 {{{
-	ud-replicate
+  ud-replicate
 }}}
 
 * as a normal user, test that the new chroot works: "dchroot $DIST", test that the stable and testing pointers work.