+ * pbuilder-checkparams (CHROOTEXEC): add --internal-chrootexec option to set CHROOTEXEC variable.

+
+	* pbuilder-createbuildenv: remove def for CHROOTEXEC
+	* pbuilder-updatebuildenv: ditto
+
+	* pbuilder-checkparams (CHROOTEXEC): CHROOTEXEC is set in checkparams, instead of -buildpackage etc.

5 files changed, 16 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index e566cf4..7a63ec5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-09-13  Junichi Uekawa  <dancer@debian.org>
+
+	* pbuilder-checkparams (CHROOTEXEC): add --internal-chrootexec option to set CHROOTEXEC variable.
+
+	* pbuilder-createbuildenv: remove def for CHROOTEXEC
+	* pbuilder-updatebuildenv: ditto
+
+	* pbuilder-checkparams (CHROOTEXEC): CHROOTEXEC is set in checkparams, instead of -buildpackage etc.
+
 2002-09-09  Junichi Uekawa  <dancer@debian.org>
 
 	* AUTHORS: add notes on devfs support.
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 845723e..55d05f7 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -73,7 +73,6 @@ function createbuilduser () {
 . /usr/lib/pbuilder/pbuilder-runhooks
 
 PACKAGENAME="$1"
-CHROOTEXEC="chroot $BUILDPLACE "
 if [ ! -f "$PACKAGENAME" ]; then
     echo "Command line parameter [$PACKAGENAME] is not a valid .dsc file name" >&2
     exit 1;
diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index 41daf86..c9d2a4d 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -24,6 +24,7 @@
 # the default is to add a PID in the buildplace specified in the config file.
 BASEBUILDPLACE="$BUILDPLACE"
 BUILDPLACE="$BUILDPLACE/$$"
+CHROOTEXEC="chroot $BUILDPLACE "
 
 while [ -n "$1" ]; do 
     case "$1" in 
@@ -33,6 +34,7 @@ while [ -n "$1" ]; do
 	    ;;
 	--buildplace)
 	    BUILDPLACE=$(readlink -f "$2");
+	    CHROOTEXEC="chroot $BUILDPLACE "
 	    shift; shift;
 	    ;;
 	--mirror)
@@ -104,6 +106,11 @@ while [ -n "$1" ]; do
 	    TIMEOUT_TIME="$2"
 	    shift; shift;
 	    ;;
+	--internal-chrootexec)
+	    # specify custom chrootexec function -- this is internal debugging function
+	    CHROOTEXEC="$2"
+	    shift; shift;
+	    ;;
 	--help)
 	    showhelp
 	    ;;
diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv
index fcbf58d..b52d24f 100755
--- a/pbuilder-createbuildenv
+++ b/pbuilder-createbuildenv
@@ -23,7 +23,6 @@ set -e
 . /usr/lib/pbuilder/pbuilder-checkparams
 . /usr/lib/pbuilder/pbuilder-runhooks
 
-CHROOTEXEC="chroot $BUILDPLACE "
 if [ -z "$DISTRIBUTION" ]; then
     DISTRIBUTION=woody
 fi
diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv
index 1721a20..abfd40a 100755
--- a/pbuilder-updatebuildenv
+++ b/pbuilder-updatebuildenv
@@ -22,8 +22,6 @@ set -e
 . /usr/lib/pbuilder/pbuilder-runhooks
 
 
-CHROOTEXEC="chroot $BUILDPLACE "
-
 if [ -n "$DISTRIBUTION" ]; then
     echo "Upgrading for distribution $DISTRIBUTION" 
 fi