From: Peter Palfrader Date: Tue, 23 Mar 2010 12:53:24 +0000 (+0100) Subject: Get rid of tabs X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-wiki.git;a=commitdiff_plain;h=d35de89bbbffef178803f5d79e7802d23287722b Get rid of tabs --- diff --git a/input/howto/dchroot.creole b/input/howto/dchroot.creole index 5f9634f..d2128dc 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 --variant=buildd $DIST ./$DIST http://$MIRROR/debian && + cp /etc/hosts $DIST/etc/ }}} * enter the chroot and create the chroot tag: @@ -52,14 +52,14 @@ EOF # Copyright (c) 2007 Peter Palfrader 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 @@ -74,8 +74,8 @@ 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/' \ + 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.