* THANKS: updated thanks file.

	* pbuilder.8: update documentation, to clarify a bit.

	* pbuilder-checkparams (BUILDPLACE): Change command-line parsing
	so that it should fix problems with specifying configfile.
	(BUILDPLACE): only set CHROOTEXEC if it is empty.
	set CHROOTEXEC to be empty at the start of param checking.

	* pbuilder-createbuildenv: use pbuilder-modules code for
	copying etc/ files.

	* pbuilder-modules: split out the function to copy local configuration.

1 files changed, 8 insertions, 6 deletions

diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index 2068291..9289af9 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -18,15 +18,11 @@
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 . /usr/lib/pbuilder/pbuilder-loadconfig
-
 . /usr/lib/pbuilder/pbuilder-modules
 
-# the default is to add a PID in the buildplace specified in the config file.
-BASEBUILDPLACE="$BUILDPLACE"
-BUILDPLACE="$BUILDPLACE/$$"
-CHROOTEXEC="chroot $BUILDPLACE "
 #default value for this option is !empty!
 INTERNAL_BUILD_UML=""
+CHROOTEXEC=""
 
 while [ -n "$1" ]; do 
     case "$1" in 
@@ -36,7 +32,6 @@ while [ -n "$1" ]; do
 	    ;;
 	--buildplace)
 	    BUILDPLACE=$(readlink -f "$2");
-	    CHROOTEXEC="chroot $BUILDPLACE "
 	    shift; shift;
 	    ;;
 	--mirror)
@@ -139,6 +134,13 @@ done
 
 BUILDPLACE=${BUILDPLACE?"Build root directory is not defined"}
 
+# the default is to add a PID in the buildplace specified in the config file.
+BASEBUILDPLACE="$BUILDPLACE"
+BUILDPLACE="$BUILDPLACE/$$"
+if [ -z "${CHROOTEXEC}" ]; then
+    CHROOTEXEC="chroot $BUILDPLACE "
+fi
+
 case "$PBCURRENTCOMMANDLINEOPERATION" in 
     login)
 	# don't do anything if it is "login"