[PATCH 3/9] organize pbuilderrc contents

[Loïc Minier]

---
 pbuilderrc |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/pbuilderrc b/pbuilderrc
index 2530d63..5164d09 100755
--- a/pbuilderrc
+++ b/pbuilderrc
@@ -39,14 +39,12 @@ APTCACHE="${PBUILDER_CACHEDIR}/${PROFILE:+$PROFILE/}aptcache/"
 CCACHEDIR="${PBUILDER_CACHEDIR}/${PROFILE:+$PROFILE/}ccache"
 
 #######################################################################
-#EXTRAPACKAGES=""
+# APT initialization parameters for chroot
+# ---------------------------------------------------------------------
 #export DEBIAN_BUILDARCH=athlon
 MIRRORSITE=http://cdn.debian.net/debian
 #OTHERMIRROR="deb http://www.home.com/updates/ ./"
 #export http_proxy=http://your-proxy:8080/
-USEPROC=yes
-USEDEVPTS=yes
-USEDEVFS=no
 
 # specifying the distribution forces the distribution on "pbuilder update"
 #DISTRIBUTION=sid
@@ -59,23 +57,39 @@ USEDEVFS=no
 COMPONENTS="main"
 #specify the cache for APT 
 APTCACHEHARDLINK="yes"
+#EXTRAPACKAGES=""
 REMOVEPACKAGES=""
+#APT configuration files directory
+APTCONFDIR=""
+
+#######################################################################
+# chroot activation parameters (mount, hook, debconf, ...)
+# ---------------------------------------------------------------------
+USEPROC=yes
+USEDEVPTS=yes
+USEDEVFS=no
+
+# BINDMOUNTS is a space separated list of things to mount
+# inside the chroot.
+BINDMOUNTS=""
+
 #HOOKDIR="/usr/lib/pbuilder/hooks"
 HOOKDIR=""
-# NB: this var is private to pbuilder; ccache uses "CCACHE_DIR" instead
 
 # make debconf not interact with user
 export DEBIAN_FRONTEND="noninteractive"
 
 DEBEMAIL=""
 
+#######################################################################
+# pbuilder activation parameters
+# ---------------------------------------------------------------------
 #for pbuilder debuild
 BUILDSOURCEROOTCMD="fakeroot"
 PBUILDERROOTCMD="sudo -E"
 # use cowbuilder for pdebuild
 #PDEBUILD_PBUILDER="cowbuilder"
 
-
 # command to satisfy build-dependencies; the default is an internal shell
 # implementation which is relatively slow; there are two alternate
 # implementations, the "experimental" implementation,
@@ -90,17 +104,10 @@ PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends"
 #DEBBUILDOPTS="-IXXX -iXXX"
 DEBBUILDOPTS=""
 
-#APT configuration files directory
-APTCONFDIR=""
-
 # the username and ID used by pbuilder, inside chroot. Needs fakeroot, really
 BUILDUSERID=1234
 BUILDUSERNAME=pbuilder
 
-# BINDMOUNTS is a space separated list of things to mount
-# inside the chroot.
-BINDMOUNTS=""
-
 # Set the debootstrap variant to 'buildd' type.
 DEBOOTSTRAPOPTS[0]='--variant=buildd'
 # or unset it to make it not a buildd type.
-- 
1.6.5