minor dchroot updates

[mirror/dsa-wiki.git] / input / howto / dchroot.creole

diff --git a/input/howto/dchroot.creole b/input/howto/dchroot.creole
index 1f93235..4db4160 100644 (file)
--- a/input/howto/dchroot.creole
+++ b/input/howto/dchroot.creole
@@ -4,10 +4,12 @@
 The script 'upgrade-porter-chroots' has expectations about naming conventions
 for new porter chroots.  The current list it searches for are:
 
 The script 'upgrade-porter-chroots' has expectations about naming conventions
 for new porter chroots.  The current list it searches for are:
 

+{{{

 lenny squeeze wheezy sid \
 lenny_i386 squeeze_i386 wheezy_i386 sid_i386 \
 lenny_amd64 squeeze_amd64 wheezy_amd64 sid_amd64 \
 sid_s390x \
 lenny squeeze wheezy sid \
 lenny_i386 squeeze_i386 wheezy_i386 sid_i386 \
 lenny_amd64 squeeze_amd64 wheezy_amd64 sid_amd64 \
 sid_s390x \

+}}}

 
 Please make sure that new chroots meet the expectations of the script, or update
 the script accordingly (it lives in the debian.org.git repo)
 
 Please make sure that new chroots meet the expectations of the script, or update
 the script accordingly (it lives in the debian.org.git repo)


@@ -21,34 +23,27 @@ Do the following as root:
 
 {{{
   echo -n 'Dist: ' && read DIST && export DIST &&
 
 {{{
   echo -n 'Dist: ' && read DIST && export DIST &&

-  echo -n 'Mirror: ' && read MIRROR && export MIRROR 
+  echo -n 'Mirror: ' && read MIRROR && export MIRROR &&
+  default_arch="$(dpkg --print-architecture)" &&
+  echo -n "Arch [$default_arch]: " && read ARCH &&
+  if [ -z "$ARCH" ]; then ARCH="$default_arch"; fi &&
+  export ARCH

 }}}
 
 
 * create the chroot
 {{{
   cd /srv/chroot &&
 }}}
 
 
 * create the chroot
 {{{
   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/
-}}} 
+  mkdir "${DIST}_${ARCH}" &&
+  debootstrap --keyring /usr/share/keyrings/debian-archive-keyring.gpg --include="apt" --variant=buildd $DIST ./"${DIST}_${ARCH}" http://$MIRROR/debian &&
+  cp /etc/hosts "${DIST}_${ARCH}"/etc/
+}}}

 
 * enter the chroot and create the chroot tag:
 {{{
 
 * enter the chroot and create the chroot tag:
 {{{

-chroot $DIST
+chroot "${DIST}_${ARCH}"

 echo $DIST > /etc/debian_chroot
 
 echo $DIST > /etc/debian_chroot
 

-# change root's .bashrc:
- 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
-+       debian_chroot=$(cat /etc/debian_chroot)
-+       PS1="[$debian_chroot] $PS1"
-+fi
- umask 022
-EOF
-#

 #*)
  echo 'Acquire::PDiffs "false";' > /etc/apt/apt.conf.d/local-pdiff
  echo 'APT::Install-Recommends 0;' > /etc/apt/apt.conf.d/local-recommends
 #*)
  echo 'Acquire::PDiffs "false";' > /etc/apt/apt.conf.d/local-pdiff
  echo 'APT::Install-Recommends 0;' > /etc/apt/apt.conf.d/local-recommends


@@ -94,7 +89,7 @@ EOF
 #
 #
 # *)
 #
 #
 # *)

-   apt-get install vim fakeroot devscripts gdb zsh dialog tcsh debfoster
+   apt-get install vim fakeroot devscripts gdb zsh dialog tcsh

 #  edit the sources.list in the chroot and add contrib/non-free to the
 #  primary source, a security updates source, and deb-src entries for both.
 #  It should end up looking something like
 #  edit the sources.list in the chroot and add contrib/non-free to the
 #  primary source, a security updates source, and deb-src entries for both.
 #  It should end up looking something like


@@ -108,8 +103,6 @@ EOF
    ) > /etc/apt/sources.list
    apt-get update && apt-get upgrade
 #
    ) > /etc/apt/sources.list
    apt-get update && apt-get upgrade
 #

-# *)
-  mount -t proc none /proc && debfoster ; umount /proc

 #
 # *)
 #  exit the chroot
 #
 # *)
 #  exit the chroot