reorganize test build log, use sed to remove always-changing factors to reduce cruft

author: Junichi Uekawa <dancer@dancer64.netfort.gr.jp> 2007-05-27 11:57:24 +0900
committer: Junichi Uekawa <dancer@dancer64.netfort.gr.jp> 2007-05-27 11:57:24 +0900
commit: 9b3c5e1f2116569d9e4ec8e7dcf00ed624873ae7 (patch)
tree: a542f74f4741f9fd6a804ec716d7c9431fced149 /testsuite
parent: 26a31b0fbc0cd85c73abf7997e6917f300d364cf (diff)
download: pbuilder-9b3c5e1f2116569d9e4ec8e7dcf00ed624873ae7.tar
pbuilder-9b3c5e1f2116569d9e4ec8e7dcf00ed624873ae7.tar.gz
36 files changed, 1359 insertions, 1181 deletions
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
index 57d11bf..ba9f5d4 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
@@ -1,8 +1,8 @@
 I: using fakeroot in build.
-Current time: Thu May 17 12:29:15 JST 2007
-pbuilder-time-stamp: 1179372555
+Current time: TIME
+pbuilder-time-stamp: XXXX
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -41,7 +41,7 @@ Get:7 http://cdn.debian.or.jp etch/main po-debconf 1.0.8 [111kB]
 Get:8 http://cdn.debian.or.jp etch/main debhelper 5.0.42 [510kB]
 Get:9 http://cdn.debian.or.jp etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3482kB in 1s (2341kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12033 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-5etch1_amd64.deb) ...
@@ -87,16 +87,16 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp etch/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (503kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12703 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
 Setting up fakeroot (1.5.10) ...
 
 Copying source file
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir1/dsh_0.25.7-1.dsc]
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir1/dsh_0.25.7.orig.tar.gz]
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir1/dsh_0.25.7-1.diff.gz]
+    -> copying [/TESTDIR/dir1/dsh_0.25.7-1.dsc]
+    -> copying [/TESTDIR/dir1/dsh_0.25.7.orig.tar.gz]
+    -> copying [/TESTDIR/dir1/dsh_0.25.7-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 gpg: can't open `/gnupg/options.skel': No such file or directory
@@ -410,9 +410,9 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
-b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+b: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -424,7 +424,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Thu May 17 03:29:54 UTC 2007
+Sun May 27 02:39:16 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -494,14 +494,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Thu May 17 03:29:59 UTC 2007
+Sun May 27 02:39:21 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-c: c
-dsh: Process terminated (before write).
 a: a
 b: b
+c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -606,7 +606,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Thu May 17 12:30:02 JST 2007
-pbuilder-time-stamp: 1179372602
+Current time: TIME
+pbuilder-time-stamp: XXXX
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir1/14892 and its subdirectories
+    -> removing directory /TESTDIR/dir1/23468 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-lenny.log b/testsuite/cdebootstrap/pbuilder-build-dsh-lenny.log
index 835017f..57acfeb 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-lenny.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-lenny.log
@@ -1,8 +1,8 @@
 I: using fakeroot in build.
-Current time: Thu May 17 12:38:10 JST 2007
-pbuilder-time-stamp: 1179373090
+Current time: TIME
+pbuilder-time-stamp: XXXX
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -41,7 +41,7 @@ Get:7 http://cdn.debian.or.jp lenny/main po-debconf 1.0.8 [111kB]
 Get:8 http://cdn.debian.or.jp lenny/main debhelper 5.0.49 [517kB]
 Get:9 http://cdn.debian.or.jp lenny/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp lenny/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3545kB in 1s (2501kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12030 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.20-4_amd64.deb) ...
@@ -87,16 +87,16 @@ The following NEW packages will be installed:
 Need to get 103kB of archives.
 After unpacking 430kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp lenny/main fakeroot 1.6.5 [103kB]
-Fetched 103kB in 0s (502kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12705 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.6.5_amd64.deb) ...
 Setting up fakeroot (1.6.5) ...
 
 Copying source file
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir1/dsh_0.25.7-1.dsc]
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir1/dsh_0.25.7.orig.tar.gz]
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir1/dsh_0.25.7-1.diff.gz]
+    -> copying [/TESTDIR/dir1/dsh_0.25.7-1.dsc]
+    -> copying [/TESTDIR/dir1/dsh_0.25.7.orig.tar.gz]
+    -> copying [/TESTDIR/dir1/dsh_0.25.7-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 gpg: can't open `/gnupg/options.skel': No such file or directory
@@ -410,9 +410,9 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
-b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+b: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -424,7 +424,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Thu May 17 03:38:52 UTC 2007
+Sun May 27 02:51:42 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -494,13 +494,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Thu May 17 03:38:57 UTC 2007
+Sun May 27 02:51:47 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-a: a
 b: b
 c: c
+dsh: Process terminated (before write).
+a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -605,7 +606,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Thu May 17 12:38:59 JST 2007
-pbuilder-time-stamp: 1179373139
+Current time: TIME
+pbuilder-time-stamp: XXXX
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir1/21319 and its subdirectories
+    -> removing directory /TESTDIR/dir1/303 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
index 1fbcbeb..9f20595 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
@@ -1,8 +1,8 @@
 I: using fakeroot in build.
-Current time: Thu May 17 12:22:16 JST 2007
-pbuilder-time-stamp: 1179372136
+Current time: TIME
+pbuilder-time-stamp: XXXX
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -28,10 +28,10 @@ The following NEW packages will be installed:
   debhelper file gettext gettext-base html2text intltool-debian libdshconfig1
   libdshconfig1-dev libmagic1 po-debconf
 0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
-Need to get 3546kB of archives.
+Need to get 3549kB of archives.
 After unpacking 12.0MB of additional disk space will be used.
-Get:1 http://cdn.debian.or.jp sid/main libmagic1 4.20-5 [327kB]
-Get:2 http://cdn.debian.or.jp sid/main file 4.20-5 [39.2kB]
+Get:1 http://cdn.debian.or.jp sid/main libmagic1 4.20-8 [329kB]
+Get:2 http://cdn.debian.or.jp sid/main file 4.20-8 [39.6kB]
 Get:3 http://cdn.debian.or.jp sid/main gettext-base 0.16.1-1 [132kB]
 Get:4 http://cdn.debian.or.jp sid/main html2text 1.3.2a-3 [92.7kB]
 Get:5 http://cdn.debian.or.jp sid/main gettext 0.16.1-1 [2261kB]
@@ -40,12 +40,12 @@ Get:7 http://cdn.debian.or.jp sid/main po-debconf 1.0.8 [111kB]
 Get:8 http://cdn.debian.or.jp sid/main debhelper 5.0.49 [517kB]
 Get:9 http://cdn.debian.or.jp sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3546kB in 1s (3511kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11040 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.20-5_amd64.deb) ...
+(Reading database ... 11070 files and directories currently installed.)
+Unpacking libmagic1 (from .../libmagic1_4.20-8_amd64.deb) ...
 Selecting previously deselected package file.
-Unpacking file (from .../archives/file_4.20-5_amd64.deb) ...
+Unpacking file (from .../archives/file_4.20-8_amd64.deb) ...
 Selecting previously deselected package gettext-base.
 Unpacking gettext-base (from .../gettext-base_0.16.1-1_amd64.deb) ...
 Selecting previously deselected package html2text.
@@ -62,9 +62,9 @@ Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.12-2_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
 Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.12-2_amd64.deb) ...
-Setting up libmagic1 (4.20-5) ...
+Setting up libmagic1 (4.20-8) ...
 
-Setting up file (4.20-5) ...
+Setting up file (4.20-8) ...
 Setting up gettext-base (0.16.1-1) ...
 
 Setting up html2text (1.3.2a-3) ...
@@ -86,16 +86,16 @@ The following NEW packages will be installed:
 Need to get 111kB of archives.
 After unpacking 451kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main fakeroot 1.7.1 [111kB]
-Fetched 111kB in 0s (893kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11715 files and directories currently installed.)
+(Reading database ... 11745 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.7.1_amd64.deb) ...
 Setting up fakeroot (1.7.1) ...
 
 Copying source file
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir1/dsh_0.25.7-1.dsc]
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir1/dsh_0.25.7.orig.tar.gz]
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir1/dsh_0.25.7-1.diff.gz]
+    -> copying [/TESTDIR/dir1/dsh_0.25.7-1.dsc]
+    -> copying [/TESTDIR/dir1/dsh_0.25.7.orig.tar.gz]
+    -> copying [/TESTDIR/dir1/dsh_0.25.7-1.diff.gz]
 Extracting source
 gpg: can't open `/gnupg/options.skel': No such file or directory
 gpg: Signature made Fri Aug 11 14:17:58 2006 UTC using DSA key ID E81E55C1
@@ -396,9 +396,9 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
-b: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
+d: dsh: Failed executing ./invalid-exec-file with llexec call
+b: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -406,11 +406,11 @@ dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
 success
 PASS: tests/param-r-invalid.sh
-2: 2
 1: 1
+2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Thu May 17 03:23:02 UTC 2007
+Sun May 27 02:32:12 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -435,6 +435,18 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 DUMPing parameters passed to llexec
 [3] 
+4: Using sleep as the remote shell
+4: Show machine names on output
+4: Adding machine 5,4,3,2,1 to list
+4: Setting forklimit to 3 and wait_shell to 0
+4: DUMPing parameters passed to llexec
+4: [4] 
+Using sleep as the remote shell
+Show machine names on output
+Adding machine 5,4,3,2,1 to list
+Setting forklimit to 3 and wait_shell to 0
+DUMPing parameters passed to llexec
+[4] 
 1: Using sleep as the remote shell
 1: Show machine names on output
 1: Adding machine 5,4,3,2,1 to list
@@ -449,18 +461,6 @@ Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 DUMPing parameters passed to llexec
 [1] 
-4: Using sleep as the remote shell
-4: Show machine names on output
-4: Adding machine 5,4,3,2,1 to list
-4: Setting forklimit to 3 and wait_shell to 0
-4: DUMPing parameters passed to llexec
-4: [4] 
-Using sleep as the remote shell
-Show machine names on output
-Adding machine 5,4,3,2,1 to list
-Setting forklimit to 3 and wait_shell to 0
-DUMPing parameters passed to llexec
-[4] 
 5: Using sleep as the remote shell
 5: Show machine names on output
 5: Adding machine 5,4,3,2,1 to list
@@ -480,13 +480,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Thu May 17 03:23:07 UTC 2007
+Sun May 27 02:32:17 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-b: b
 a: a
+b: b
 c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -581,7 +582,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Thu May 17 12:23:09 JST 2007
-pbuilder-time-stamp: 1179372189
+Current time: TIME
+pbuilder-time-stamp: XXXX
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir1/10586 and its subdirectories
+    -> removing directory /TESTDIR/dir1/17760 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-etch.log b/testsuite/cdebootstrap/pbuilder-create-etch.log
index ed81251..5ff80d2 100644
--- a/testsuite/cdebootstrap/pbuilder-create-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-create-etch.log
@@ -331,8 +331,7 @@ P: Configuring package base-passwd
 O: 
 P: Configuring helper cdebootstrap-helper-diverts
 O: Selecting previously deselected package cdebootstrap-helper-diverts.
-O: (Reading database ... 
-O: 24 files and directories currently installed.)
+O: (Reading database ... 24 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-diverts (from .../cdebootstrap-helper-diverts.deb) ...
 O: Adding `diversion of /sbin/start-stop-daemon to /sbin/start-stop-daemon.REAL by cdebootstrap-helper-diverts'
 O: Adding `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by cdebootstrap-helper-diverts'
@@ -889,8 +888,7 @@ O: Setting up debconf (1.5.11) ...
 P: Configuring package debconf
 O: 
 O: Selecting previously deselected package libbz2-1.0.
-O: (Reading database ... 
-O: 4813 files and directories currently installed.)
+O: (Reading database ... 4813 files and directories currently installed.)
 O: Unpacking libbz2-1.0 (from .../libbz2-1.0_1.0.3-6_amd64.deb) ...
 P: Unpacking package libbz2-1.0
 O: Selecting previously deselected package libgpg-error0.
@@ -1362,7 +1360,7 @@ umount: /proc/bus/usb: not found
 umount: /dev/shm: not mounted
 umount: /proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//28242/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//4333/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
@@ -1371,7 +1369,7 @@ Refreshing the base.tgz
 Get:1 http://cdn.debian.or.jp etch Release.gpg [378B]
 Get:2 http://cdn.debian.or.jp etch Release [58.2kB]
 Get:3 http://cdn.debian.or.jp etch/main Packages [5549kB]
-Fetched 5608kB in 3s (1835kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -1415,7 +1413,7 @@ Get:14 http://cdn.debian.or.jp etch/main g++ 4:4.1.1-15 [1358B]
 Get:15 http://cdn.debian.or.jp etch/main make 3.81-2 [390kB]
 Get:16 http://cdn.debian.or.jp etch/main dpkg-dev 1.13.25 [166kB]
 Get:17 http://cdn.debian.or.jp etch/main build-essential 11.3 [6982B]
-Fetched 21.2MB in 8s (2403kB/s)
+Fetched 21.2MB in 23s (889kB/s)
 Selecting previously deselected package patch.
 (Reading database ... 7112 files and directories currently installed.)
 Unpacking patch (from .../patch_2.5.9-4_amd64.deb) ...
@@ -1481,9 +1479,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//28242/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//4333/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> creating base tarball [/TESTDIR/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//28242 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//4333 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-lenny.log b/testsuite/cdebootstrap/pbuilder-create-lenny.log
index 8d7b46b..47231f4 100644
--- a/testsuite/cdebootstrap/pbuilder-create-lenny.log
+++ b/testsuite/cdebootstrap/pbuilder-create-lenny.log
@@ -320,8 +320,7 @@ P: Extracting sysvinit
 P: Extracting tar
 P: Extracting util-linux
 O: Selecting previously deselected package base-passwd.
-O: (Reading database ... 
-O: 0 files and directories currently installed.)
+O: (Reading database ... 0 files and directories currently installed.)
 O: Unpacking base-passwd (from .../base-passwd_3.5.11_amd64.deb) ...
 P: Unpacking package base-passwd
 O: dpkg: base-passwd: dependency problems, but configuring anyway as you request:
@@ -332,8 +331,7 @@ P: Configuring package base-passwd
 O: 
 P: Configuring helper cdebootstrap-helper-diverts
 O: Selecting previously deselected package cdebootstrap-helper-diverts.
-O: (Reading database ... 
-O: 24 files and directories currently installed.)
+O: (Reading database ... 24 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-diverts (from .../cdebootstrap-helper-diverts.deb) ...
 O: Adding `diversion of /sbin/start-stop-daemon to /sbin/start-stop-daemon.REAL by cdebootstrap-helper-diverts'
 O: Adding `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by cdebootstrap-helper-diverts'
@@ -392,7 +390,7 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking debconf (from .../debconf_1.5.13_all.deb) ...
 P: Unpacking package debconf
 O: Selecting previously deselected package tzdata.
-O: Unpacking tzdata (from .../tzdata_2007f-1_all.deb) ...
+O: Unpacking tzdata (from .../tzdata_2007f-3_all.deb) ...
 P: Unpacking package tzdata
 O: Selecting previously deselected package libc6.
 O: Unpacking libc6 (from .../libc6_2.3.6.ds1-13_amd64.deb) ...
@@ -742,12 +740,12 @@ P: Configuring package debconf-i18n
 O: Setting up debconf (1.5.13) ...
 P: Configuring package debconf
 O: 
-O: Setting up tzdata (2007f-1) ...
+O: Setting up tzdata (2007f-3) ...
 P: Configuring package tzdata
 O: 
 O: Current default timezone: 'Etc/UTC'
-O: Local time is now:      Thu May 17 03:37:11 UTC 2007.
-O: Universal Time is now:  Thu May 17 03:37:11 UTC 2007.
+O: Local time is now:      Sun May 27 02:49:22 UTC 2007.
+O: Universal Time is now:  Sun May 27 02:49:22 UTC 2007.
 O: Run 'dpkg-reconfigure tzdata' if you wish to change it.
 O: 
 O: 
@@ -1365,7 +1363,7 @@ umount: /proc/bus/usb: not found
 umount: /dev/shm: not mounted
 umount: /proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//2178/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//12554/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
@@ -1373,8 +1371,8 @@ Refreshing the base.tgz
  -> installing dummy policy-rc.d
 Get:1 http://cdn.debian.or.jp lenny Release.gpg [189B]
 Get:2 http://cdn.debian.or.jp lenny Release [68.5kB]
-Get:3 http://cdn.debian.or.jp lenny/main Packages [5835kB]
-Fetched 5903kB in 1s (3265kB/s)
+Get:3 http://cdn.debian.or.jp lenny/main Packages [5862kB]
+Fetched XXkB in Xs (XXXXkB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -1417,7 +1415,7 @@ Get:14 http://cdn.debian.or.jp lenny/main g++ 4:4.1.1-15 [1358B]
 Get:15 http://cdn.debian.or.jp lenny/main make 3.81-3 [395kB]
 Get:16 http://cdn.debian.or.jp lenny/main dpkg-dev 1.13.25 [166kB]
 Get:17 http://cdn.debian.or.jp lenny/main build-essential 11.3 [6982B]
-Fetched 21.2MB in 8s (2371kB/s)
+Fetched 21.2MB in 8s (2425kB/s)
 Selecting previously deselected package patch.
 (Reading database ... 7109 files and directories currently installed.)
 Unpacking patch (from .../patch_2.5.9-4_amd64.deb) ...
@@ -1483,9 +1481,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//2178/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//12554/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> creating base tarball [/TESTDIR/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//2178 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//12554 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-sid.log b/testsuite/cdebootstrap/pbuilder-create-sid.log
index 534b301..8cd86c3 100644
--- a/testsuite/cdebootstrap/pbuilder-create-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-create-sid.log
@@ -48,8 +48,8 @@ P: Retrieving debconf
 P: Validating debconf
 P: Retrieving adduser
 P: Validating adduser
-P: Retrieving gcc-4.1-base
-P: Validating gcc-4.1-base
+P: Retrieving gcc-4.2-base
+P: Validating gcc-4.2-base
 P: Retrieving libgcc1
 P: Validating libgcc1
 P: Retrieving libstdc++6
@@ -164,6 +164,8 @@ P: Retrieving nano
 P: Validating nano
 P: Retrieving findutils
 P: Validating findutils
+P: Retrieving gcc-4.1-base
+P: Validating gcc-4.1-base
 P: Retrieving grep
 P: Validating grep
 P: Retrieving groff-base
@@ -276,7 +278,7 @@ P: Extracting libtext-charwidth-perl
 P: Extracting libtext-wrapi18n-perl
 P: Extracting debconf
 P: Extracting debconf-i18n
-P: Extracting gcc-4.1-base
+P: Extracting gcc-4.2-base
 P: Extracting libgcc1
 P: Extracting libstdc++6
 P: Extracting zlib1g
@@ -304,6 +306,7 @@ P: Extracting libss2
 P: Extracting libuuid1
 P: Extracting e2fsprogs
 P: Extracting findutils
+P: Extracting gcc-4.1-base
 P: Extracting grep
 P: Extracting gzip
 P: Extracting hostname
@@ -345,28 +348,28 @@ O: Unpacking cdebootstrap-helper-makedev (from .../cdebootstrap-helper-makedev.d
 O: Setting up cdebootstrap-helper-makedev (1) ...
 O: 
 O: Selecting previously deselected package dpkg.
-O: dpkg: regarding .../dpkg_1.14.3_amd64.deb containing dpkg, pre-dependency problem:
+O: dpkg: regarding .../dpkg_1.14.4_amd64.deb containing dpkg, pre-dependency problem:
 O:  dpkg pre-depends on libc6 (>= 2.5-5)
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../dpkg_1.14.3_amd64.deb containing dpkg, pre-dependency problem:
+O: dpkg: regarding .../dpkg_1.14.4_amd64.deb containing dpkg, pre-dependency problem:
 O:  dpkg pre-depends on coreutils (>= 5.93-1)
 O: dpkg: warning - ignoring pre-dependency problem !
 O: (Reading database ... 
 O: 29 files and directories currently installed.)
-O: Unpacking dpkg (from .../dpkg_1.14.3_amd64.deb) ...
+O: Unpacking dpkg (from .../dpkg_1.14.4_amd64.deb) ...
 P: Unpacking package dpkg
 O: dpkg: dpkg: dependency problems, but configuring anyway as you request:
 O:  dpkg depends on libc6 (>= 2.5-5); however:
 O:   Package libc6 is not installed.
 O:  dpkg depends on coreutils (>= 5.93-1); however:
 O:   Package coreutils is not installed.
-O: Setting up dpkg (1.14.3) ...
+O: Setting up dpkg (1.14.4) ...
 P: Configuring package dpkg
 O: 
 O: Selecting previously deselected package libc6.
 O: (Reading database ... 
-O: 245 files and directories currently installed.)
-O: Unpacking libc6 (from .../libc6_2.5-7_amd64.deb) ...
+O: 251 files and directories currently installed.)
+O: Unpacking libc6 (from .../libc6_2.5-9_amd64.deb) ...
 P: Unpacking package libc6
 O: Selecting previously deselected package perl-base.
 O: dpkg: regarding .../perl-base_5.8.8-7_amd64.deb containing perl-base, pre-dependency problem:
@@ -397,25 +400,29 @@ O: Selecting previously deselected package libpam-modules.
 O: Unpacking libpam-modules (from .../libpam-modules_0.79-4_amd64.deb) ...
 P: Unpacking package libpam-modules
 O: Selecting previously deselected package login.
-O: dpkg: regarding .../login_4.0.18.1-8_amd64.deb containing login, pre-dependency problem:
+O: dpkg: regarding .../login_4.0.18.1-9_amd64.deb containing login, pre-dependency problem:
 O:  login pre-depends on libc6 (>= 2.5-5)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../login_4.0.18.1-8_amd64.deb containing login, pre-dependency problem:
+O: dpkg: regarding .../login_4.0.18.1-9_amd64.deb containing login, pre-dependency problem:
 O:  login pre-depends on libpam0g (>= 0.76)
 O:   libpam0g is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../login_4.0.18.1-8_amd64.deb containing login, pre-dependency problem:
+O: dpkg: regarding .../login_4.0.18.1-9_amd64.deb containing login, pre-dependency problem:
 O:  login pre-depends on libpam-runtime (>= 0.76-14)
 O:   libpam-runtime is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking login (from .../login_4.0.18.1-8_amd64.deb) ...
+O: Unpacking login (from .../login_4.0.18.1-9_amd64.deb) ...
 P: Unpacking package login
 O: Selecting previously deselected package debianutils.
-O: Unpacking debianutils (from .../debianutils_2.18.1_amd64.deb) ...
+O: dpkg: regarding .../debianutils_2.19_amd64.deb containing debianutils, pre-dependency problem:
+O:  debianutils pre-depends on libc6 (>= 2.5-5)
+O:   libc6 is unpacked, but has never been configured.
+O: dpkg: warning - ignoring pre-dependency problem !
+O: Unpacking debianutils (from .../debianutils_2.19_amd64.deb) ...
 P: Unpacking package debianutils
 O: Selecting previously deselected package passwd.
-O: Unpacking passwd (from .../passwd_4.0.18.1-8_amd64.deb) ...
+O: Unpacking passwd (from .../passwd_4.0.18.1-9_amd64.deb) ...
 P: Unpacking package passwd
 O: Selecting previously deselected package liblocale-gettext-perl.
 O: dpkg: regarding .../liblocale-gettext-perl_1.05-1_amd64.deb containing liblocale-gettext-perl, pre-dependency problem:
@@ -447,20 +454,20 @@ P: Unpacking package debconf
 O: Selecting previously deselected package debconf-i18n.
 O: Unpacking debconf-i18n (from .../debconf-i18n_1.5.13_all.deb) ...
 P: Unpacking package debconf-i18n
-O: Selecting previously deselected package gcc-4.1-base.
-O: Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1.2-7_amd64.deb) ...
-P: Unpacking package gcc-4.1-base
+O: Selecting previously deselected package gcc-4.2-base.
+O: Unpacking gcc-4.2-base (from .../gcc-4.2-base_4.2-20070525-1_amd64.deb) ...
+P: Unpacking package gcc-4.2-base
 O: Selecting previously deselected package libgcc1.
-O: Unpacking libgcc1 (from .../libgcc1_4.1.2-7_amd64.deb) ...
+O: Unpacking libgcc1 (from .../libgcc1_4.2-20070525-1_amd64.deb) ...
 P: Unpacking package libgcc1
 O: Selecting previously deselected package libstdc++6.
-O: Unpacking libstdc++6 (from .../libstdc++6_4.1.2-7_amd64.deb) ...
+O: Unpacking libstdc++6 (from .../libstdc++6_4.2-20070525-1_amd64.deb) ...
 P: Unpacking package libstdc++6
 O: Selecting previously deselected package zlib1g.
-O: Unpacking zlib1g (from .../zlib1g_1.2.3-14_amd64.deb) ...
+O: Unpacking zlib1g (from .../zlib1g_1.2.3-15_amd64.deb) ...
 P: Unpacking package zlib1g
 O: Selecting previously deselected package libncurses5.
-O: Unpacking libncurses5 (from .../libncurses5_5.5-5_amd64.deb) ...
+O: Unpacking libncurses5 (from .../libncurses5_5.6-3_amd64.deb) ...
 P: Unpacking package libncurses5
 O: Selecting previously deselected package makedev.
 O: Unpacking makedev (from .../makedev_2.3.1-83_all.deb) ...
@@ -525,22 +532,22 @@ O: Use of uninitialized value in length at /usr/sbin/dpkg-divert line 224.
 O: Use of uninitialized value in length at /usr/sbin/dpkg-divert line 224.
 O: No diversion `any diversion of /usr/bin/md5sum.textutils', none removed
 O: Selecting previously deselected package sed.
-O: dpkg: regarding .../sed_4.1.5-1_amd64.deb containing sed, pre-dependency problem:
-O:  sed pre-depends on libc6 (>= 2.3.5-1)
+O: dpkg: regarding .../sed_4.1.5-2_amd64.deb containing sed, pre-dependency problem:
+O:  sed pre-depends on libc6 (>= 2.5-5)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking sed (from .../sed_4.1.5-1_amd64.deb) ...
+O: Unpacking sed (from .../sed_4.1.5-2_amd64.deb) ...
 P: Unpacking package sed
 O: Selecting previously deselected package ncurses-bin.
-O: dpkg: regarding .../ncurses-bin_5.5-5_amd64.deb containing ncurses-bin, pre-dependency problem:
-O:  ncurses-bin pre-depends on libc6 (>= 2.3.5-1)
+O: dpkg: regarding .../ncurses-bin_5.6-3_amd64.deb containing ncurses-bin, pre-dependency problem:
+O:  ncurses-bin pre-depends on libc6 (>= 2.5-5)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../ncurses-bin_5.5-5_amd64.deb containing ncurses-bin, pre-dependency problem:
+O: dpkg: regarding .../ncurses-bin_5.6-3_amd64.deb containing ncurses-bin, pre-dependency problem:
 O:  ncurses-bin pre-depends on libncurses5 (>= 5.4-5)
 O:   libncurses5 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking ncurses-bin (from .../ncurses-bin_5.5-5_amd64.deb) ...
+O: Unpacking ncurses-bin (from .../ncurses-bin_5.6-3_amd64.deb) ...
 P: Unpacking package ncurses-bin
 O: Selecting previously deselected package lsb-base.
 O: Unpacking lsb-base (from .../lsb-base_3.1-23.1_all.deb) ...
@@ -553,7 +560,7 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking diff (from .../diff_2.8.1-12_amd64.deb) ...
 P: Unpacking package diff
 O: Selecting previously deselected package dselect.
-O: Unpacking dselect (from .../dselect_1.14.3_amd64.deb) ...
+O: Unpacking dselect (from .../dselect_1.14.4_amd64.deb) ...
 P: Unpacking package dselect
 O: Selecting previously deselected package e2fslibs.
 O: Unpacking e2fslibs (from .../e2fslibs_1.39+1.40-WIP-2007.04.07+dfsg-2_amd64.deb) ...
@@ -607,6 +614,9 @@ O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking findutils (from .../findutils_4.2.30-1_amd64.deb) ...
 P: Unpacking package findutils
+O: Selecting previously deselected package gcc-4.1-base.
+O: Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1.2-8_amd64.deb) ...
+P: Unpacking package gcc-4.1-base
 O: Selecting previously deselected package grep.
 O: dpkg: regarding .../grep_2.5.1.ds2-6_amd64.deb containing grep, pre-dependency problem:
 O:  grep pre-depends on libc6 (>= 2.3.5-1)
@@ -653,10 +663,14 @@ O: Selecting previously deselected package libslang2.
 O: Unpacking libslang2 (from .../libslang2_2.0.7-1_amd64.deb) ...
 P: Unpacking package libslang2
 O: Selecting previously deselected package mktemp.
-O: Unpacking mktemp (from .../mktemp_1.5-2_amd64.deb) ...
+O: dpkg: regarding .../mktemp_1.5-3_amd64.deb containing mktemp, pre-dependency problem:
+O:  mktemp pre-depends on libc6 (>= 2.5-5)
+O:   libc6 is unpacked, but has never been configured.
+O: dpkg: warning - ignoring pre-dependency problem !
+O: Unpacking mktemp (from .../mktemp_1.5-3_amd64.deb) ...
 P: Unpacking package mktemp
 O: Selecting previously deselected package ncurses-base.
-O: Unpacking ncurses-base (from .../ncurses-base_5.5-5_all.deb) ...
+O: Unpacking ncurses-base (from .../ncurses-base_5.6-3_all.deb) ...
 P: Unpacking package ncurses-base
 O: Selecting previously deselected package procps.
 O: Unpacking procps (from .../procps_3.2.7-3_amd64.deb) ...
@@ -687,7 +701,7 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking tar (from .../tar_1.16.1-1_amd64.deb) ...
 P: Unpacking package tar
 O: Selecting previously deselected package tzdata.
-O: Unpacking tzdata (from .../tzdata_2007f-2_all.deb) ...
+O: Unpacking tzdata (from .../tzdata_2007f-4_all.deb) ...
 P: Unpacking package tzdata
 O: Selecting previously deselected package util-linux.
 O: dpkg: regarding .../util-linux_2.12r-19_amd64.deb containing util-linux, pre-dependency problem:
@@ -717,21 +731,24 @@ P: Configuring package makedev
 O: 
 O: Setting up sysv-rc (2.86.ds1-38) ...
 P: Configuring package sysv-rc
-O: Setting up gcc-4.1-base (4.1.2-7) ...
+O: Setting up gcc-4.1-base (4.1.2-8) ...
 P: Configuring package gcc-4.1-base
 O: 
+O: Setting up gcc-4.2-base (4.2-20070525-1) ...
+P: Configuring package gcc-4.2-base
+O: 
 O: Setting up libpam-runtime (0.79-4) ...
 P: Configuring package libpam-runtime
 O: 
-O: Setting up libc6 (2.5-7) ...
+O: Setting up libc6 (2.5-9) ...
 P: Configuring package libc6
 O: 
 O: Setting up libcap1 (1:1.10-14) ...
 P: Configuring package libcap1
 O: 
-O: Setting up mktemp (1.5-2) ...
+O: Setting up mktemp (1.5-3) ...
 P: Configuring package mktemp
-O: Setting up debianutils (2.18.1) ...
+O: Setting up debianutils (2.19) ...
 P: Configuring package debianutils
 O: 
 O: Setting up libuuid1 (1.39+1.40-WIP-2007.04.07+dfsg-2) ...
@@ -753,21 +770,21 @@ O:
 O: Setting up tar (1.16.1-1) ...
 P: Configuring package tar
 O: 
-O: Setting up zlib1g (1:1.2.3-14) ...
+O: Setting up zlib1g (1:1.2.3-15) ...
 P: Configuring package zlib1g
 O: 
-O: Setting up libgcc1 (1:4.1.2-7) ...
+O: Setting up libgcc1 (1:4.2-20070525-1) ...
 P: Configuring package libgcc1
 O: 
 O: Setting up libtext-iconv-perl (1.4-3) ...
 P: Configuring package libtext-iconv-perl
-O: Setting up libncurses5 (5.5-5) ...
+O: Setting up libncurses5 (5.6-3) ...
 P: Configuring package libncurses5
 O: 
 O: Setting up libattr1 (1:2.4.32-1.1) ...
 P: Configuring package libattr1
 O: 
-O: Setting up sed (4.1.5-1) ...
+O: Setting up sed (4.1.5-2) ...
 P: Configuring package sed
 O: install-info(/usr/share/info/sed.info): no backup file /var/backups/infodir.bak available, retrieving default file.
 O: 
@@ -811,7 +828,7 @@ P: Configuring package libselinux1
 O: init: 
 O: /dev/initctl: No such file or directory
 O: 
-O: Setting up libstdc++6 (4.1.2-7) ...
+O: Setting up libstdc++6 (4.2-20070525-1) ...
 P: Configuring package libstdc++6
 O: 
 O: Setting up libtext-charwidth-perl (0.04-4) ...
@@ -821,9 +838,9 @@ P: Configuring package libtext-wrapi18n-perl
 O: Setting up coreutils (5.97-5.3) ...
 P: Configuring package coreutils
 O: 
-O: Setting up ncurses-base (5.5-5) ...
+O: Setting up ncurses-base (5.6-3) ...
 P: Configuring package ncurses-base
-O: Setting up ncurses-bin (5.5-5) ...
+O: Setting up ncurses-bin (5.6-3) ...
 P: Configuring package ncurses-bin
 O: Setting up libpam-modules (0.79-4) ...
 P: Configuring package libpam-modules
@@ -839,14 +856,14 @@ P: Configuring package libblkid1
 O: 
 O: Setting up e2fsprogs (1.39+1.40-WIP-2007.04.07+dfsg-2) ...
 P: Configuring package e2fsprogs
-O: Setting up dselect (1.14.3) ...
+O: Setting up dselect (1.14.4) ...
 P: Configuring package dselect
 O: Setting up sysvinit-utils (2.86.ds1-38) ...
 P: Configuring package sysvinit-utils
 O: Setting up bash (3.1dfsg-8) ...
 P: Configuring package bash
 O: 
-O: Setting up login (1:4.0.18.1-8) ...
+O: Setting up login (1:4.0.18.1-9) ...
 P: Configuring package login
 O: 
 O: Setting up lsb-base (3.1-23.1) ...
@@ -857,7 +874,7 @@ O:
 O: Setting up mount (2.12r-19) ...
 P: Configuring package mount
 O: 
-O: Setting up passwd (1:4.0.18.1-8) ...
+O: Setting up passwd (1:4.0.18.1-9) ...
 P: Configuring package passwd
 O: Shadow passwords are now on.
 O: 
@@ -875,12 +892,12 @@ P: Configuring package debconf-i18n
 O: Setting up debconf (1.5.13) ...
 P: Configuring package debconf
 O: 
-O: Setting up tzdata (2007f-2) ...
+O: Setting up tzdata (2007f-4) ...
 P: Configuring package tzdata
 O: 
 O: Current default timezone: 'Etc/UTC'
-O: Local time is now:      Thu May 17 03:21:22 UTC 2007.
-O: Universal Time is now:  Thu May 17 03:21:22 UTC 2007.
+O: Local time is now:      Sun May 27 02:28:58 UTC 2007.
+O: Universal Time is now:  Sun May 27 02:28:58 UTC 2007.
 O: Run 'dpkg-reconfigure tzdata' if you wish to change it.
 O: 
 O: 
@@ -889,8 +906,8 @@ P: Configuring package util-linux
 O: 
 O: Selecting previously deselected package libbz2-1.0.
 O: (Reading database ... 
-O: 4862 files and directories currently installed.)
-O: Unpacking libbz2-1.0 (from .../libbz2-1.0_1.0.3-6_amd64.deb) ...
+O: 4876 files and directories currently installed.)
+O: Unpacking libbz2-1.0 (from .../libbz2-1.0_1.0.3-7_amd64.deb) ...
 P: Unpacking package libbz2-1.0
 O: Selecting previously deselected package libgpg-error0.
 O: Unpacking libgpg-error0 (from .../libgpg-error0_1.4-2_amd64.deb) ...
@@ -920,10 +937,10 @@ O: Selecting previously deselected package libldap2.
 O: Unpacking libldap2 (from .../libldap2_2.1.30-13.4_amd64.deb) ...
 P: Unpacking package libldap2
 O: Selecting previously deselected package readline-common.
-O: Unpacking readline-common (from .../readline-common_5.2-2_all.deb) ...
+O: Unpacking readline-common (from .../readline-common_5.2-3_all.deb) ...
 P: Unpacking package readline-common
 O: Selecting previously deselected package libreadline5.
-O: Unpacking libreadline5 (from .../libreadline5_5.2-2_amd64.deb) ...
+O: Unpacking libreadline5 (from .../libreadline5_5.2-3_amd64.deb) ...
 P: Unpacking package libreadline5
 O: Selecting previously deselected package libusb-0.1-4.
 O: Unpacking libusb-0.1-4 (from .../libusb-0.1-4_0.1.12-7_amd64.deb) ...
@@ -940,7 +957,7 @@ P: Unpacking package debian-archive-keyring
 O: Selecting previously deselected package apt.
 O: Unpacking apt (from .../apt_0.6.46.4-0.1_amd64.deb) ...
 P: Unpacking package apt
-O: Setting up libbz2-1.0 (1.0.3-6) ...
+O: Setting up libbz2-1.0 (1.0.3-7) ...
 P: Configuring package libbz2-1.0
 O: 
 O: Setting up libgpg-error0 (1.4-2) ...
@@ -969,10 +986,10 @@ O:
 O: Setting up libldap2 (2.1.30-13.4) ...
 P: Configuring package libldap2
 O: 
-O: Setting up readline-common (5.2-2) ...
+O: Setting up readline-common (5.2-3) ...
 P: Configuring package readline-common
 O: 
-O: Setting up libreadline5 (5.2-2) ...
+O: Setting up libreadline5 (5.2-3) ...
 P: Configuring package libreadline5
 O: 
 O: Setting up libusb-0.1-4 (2:0.1.12-7) ...
@@ -1018,7 +1035,7 @@ O:
 P: Configuring helper cdebootstrap-helper-apt
 O: Selecting previously deselected package cdebootstrap-helper-apt.
 O: (Reading database ... 
-O: 5269 files and directories currently installed.)
+O: 5283 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-apt (from /cdebootstrap-helper-apt.deb) ...
 O: Setting up cdebootstrap-helper-apt (1) ...
 O: Get:1 bootstrap: . Release.gpg [189B]
@@ -1045,7 +1062,7 @@ O:   module-init-tools nano net-tools netbase netcat openbsd-inetd sysklogd
 O:   tasksel tasksel-data tcpd traceroute update-inetd vim-common vim-tiny wget
 O:   whiptail
 O: 0 upgraded, 46 newly installed, 0 to remove and 0 not upgraded.
-O: Need to get 12.4MB of archives.
+O: Need to get 12.5MB of archives.
 O: After unpacking 39.6MB of additional disk space will be used.
 O: WARNING: The following packages cannot be authenticated!
 O:   adduser libdb4.4 apt-utils libncursesw5 libsigc++-2.0-0c2a aptitude
@@ -1059,7 +1076,7 @@ O: debconf: delaying package configuration, since apt-utils is not installed
 O: Authentication warning overridden.
 O: Selecting previously deselected package adduser.
 O: (Reading database ... 
-O: 5270 files and directories currently installed.)
+O: 5284 files and directories currently installed.)
 O: Unpacking adduser (from .../adduser_3.102_all.deb) ...
 P: Unpacking package adduser
 O: Selecting previously deselected package libdb4.4.
@@ -1069,7 +1086,7 @@ O: Selecting previously deselected package apt-utils.
 O: Unpacking apt-utils (from .../apt-utils_0.6.46.4-0.1_amd64.deb) ...
 P: Unpacking package apt-utils
 O: Selecting previously deselected package libncursesw5.
-O: Unpacking libncursesw5 (from .../libncursesw5_5.5-5_amd64.deb) ...
+O: Unpacking libncursesw5 (from .../libncursesw5_5.6-3_amd64.deb) ...
 P: Unpacking package libncursesw5
 O: Selecting previously deselected package libsigc++-2.0-0c2a.
 O: Unpacking libsigc++-2.0-0c2a (from .../libsigc++-2.0-0c2a_2.0.17-2_amd64.deb) ...
@@ -1081,7 +1098,7 @@ O: Selecting previously deselected package bsdmainutils.
 O: Unpacking bsdmainutils (from .../bsdmainutils_6.1.6_amd64.deb) ...
 P: Unpacking package bsdmainutils
 O: Selecting previously deselected package cpio.
-O: Unpacking cpio (from .../bootstrap/cpio_2.7-2_amd64.deb) ...
+O: Unpacking cpio (from .../bootstrap/cpio_2.7-3_amd64.deb) ...
 P: Unpacking package cpio
 O: Selecting previously deselected package cron.
 O: Unpacking cron (from .../cron_3.0pl1-100_amd64.deb) ...
@@ -1093,7 +1110,7 @@ O: Selecting previously deselected package dhcp3-client.
 O: Unpacking dhcp3-client (from .../dhcp3-client_3.0.4-14_amd64.deb) ...
 P: Unpacking package dhcp3-client
 O: Selecting previously deselected package dmidecode.
-O: Unpacking dmidecode (from .../dmidecode_2.8-4_amd64.deb) ...
+O: Unpacking dmidecode (from .../dmidecode_2.9-1_amd64.deb) ...
 P: Unpacking package dmidecode
 O: Selecting previously deselected package ed.
 O: Unpacking ed (from .../bootstrap/ed_0.2-20_amd64.deb) ...
@@ -1108,7 +1125,7 @@ O: Selecting previously deselected package ifupdown.
 O: Unpacking ifupdown (from .../ifupdown_0.6.8_amd64.deb) ...
 P: Unpacking package ifupdown
 O: Selecting previously deselected package info.
-O: Unpacking info (from .../info_4.8.dfsg.1-5_amd64.deb) ...
+O: Unpacking info (from .../info_4.8.dfsg.1-6_amd64.deb) ...
 P: Unpacking package info
 O: Selecting previously deselected package iptables.
 O: Unpacking iptables (from .../iptables_1.3.6.0debian1-5_amd64.deb) ...
@@ -1123,7 +1140,7 @@ O: Selecting previously deselected package klogd.
 O: Unpacking klogd (from .../klogd_1.4.1-20_amd64.deb) ...
 P: Unpacking package klogd
 O: Selecting previously deselected package laptop-detect.
-O: Unpacking laptop-detect (from .../laptop-detect_0.12.1-0.1_amd64.deb) ...
+O: Unpacking laptop-detect (from .../laptop-detect_0.13.1_amd64.deb) ...
 P: Unpacking package laptop-detect
 O: Selecting previously deselected package libconsole.
 O: Unpacking libconsole (from .../libconsole_0.2.3dbs-65_amd64.deb) ...
@@ -1150,13 +1167,13 @@ O: Selecting previously deselected package logrotate.
 O: Unpacking logrotate (from .../logrotate_3.7.1-3_amd64.deb) ...
 P: Unpacking package logrotate
 O: Selecting previously deselected package man-db.
-O: Unpacking man-db (from .../man-db_2.4.4-2_amd64.deb) ...
+O: Unpacking man-db (from .../man-db_2.4.4-3_amd64.deb) ...
 P: Unpacking package man-db
 O: Selecting previously deselected package manpages.
-O: Unpacking manpages (from .../manpages_2.46-1_all.deb) ...
+O: Unpacking manpages (from .../manpages_2.49-1_all.deb) ...
 P: Unpacking package manpages
 O: Selecting previously deselected package module-init-tools.
-O: Unpacking module-init-tools (from .../module-init-tools_3.3-pre4-2_amd64.deb) ...
+O: Unpacking module-init-tools (from .../module-init-tools_3.3-pre11-1_amd64.deb) ...
 P: Unpacking package module-init-tools
 O: Selecting previously deselected package nano.
 O: Unpacking nano (from .../nano_2.0.6-1_amd64.deb) ...
@@ -1205,7 +1222,7 @@ P: Configuring package libdb4.4
 O: Setting up apt-utils (0.6.46.4-0.1) ...
 P: Configuring package apt-utils
 O: 
-O: Setting up libncursesw5 (5.5-5) ...
+O: Setting up libncursesw5 (5.6-3) ...
 P: Configuring package libncursesw5
 O: 
 O: Setting up libsigc++-2.0-0c2a (2.0.17-2) ...
@@ -1217,7 +1234,7 @@ O:
 O: Setting up bsdmainutils (6.1.6) ...
 P: Configuring package bsdmainutils
 O: 
-O: Setting up cpio (2.7-2) ...
+O: Setting up cpio (2.7-3) ...
 P: Configuring package cpio
 O: 
 O: Setting up cron (3.0pl1-100) ...
@@ -1230,7 +1247,7 @@ P: Configuring package dhcp3-common
 O: Setting up dhcp3-client (3.0.4-14) ...
 P: Configuring package dhcp3-client
 O: 
-O: Setting up dmidecode (2.8-4) ...
+O: Setting up dmidecode (2.9-1) ...
 P: Configuring package dmidecode
 O: Setting up ed (0.2-20) ...
 P: Configuring package ed
@@ -1248,7 +1265,7 @@ O:
 O: ifupdown.postinst: Warning: No 'iface lo' definition found in /etc/network/interfaces
 O: ifupdown.postinst: Warning: No 'auto lo' statement found in /etc/network/interfaces
 O: 
-O: Setting up info (4.8.dfsg.1-5) ...
+O: Setting up info (4.8.dfsg.1-6) ...
 P: Configuring package info
 O: 
 O: Setting up iptables (1.3.6.0debian1-5) ...
@@ -1256,7 +1273,7 @@ P: Configuring package iptables
 O: 
 O: Setting up iputils-ping (3:20070202-1) ...
 P: Configuring package iputils-ping
-O: Setting up laptop-detect (0.12.1-0.1) ...
+O: Setting up laptop-detect (0.13.1) ...
 P: Configuring package laptop-detect
 O: Setting up libconsole (1:0.2.3dbs-65) ...
 P: Configuring package libconsole
@@ -1281,13 +1298,13 @@ P: Configuring package libwrap0
 O: 
 O: Setting up logrotate (3.7.1-3) ...
 P: Configuring package logrotate
-O: Setting up man-db (2.4.4-2) ...
+O: Setting up man-db (2.4.4-3) ...
 P: Configuring package man-db
 O: Building database of manual pages ...
 O: 
-O: Setting up manpages (2.46-1) ...
+O: Setting up manpages (2.49-1) ...
 P: Configuring package manpages
-O: Setting up module-init-tools (3.3-pre4-2) ...
+O: Setting up module-init-tools (3.3-pre11-1) ...
 P: Configuring package module-init-tools
 O: 
 O: Setting up nano (2.0.6-1) ...
@@ -1334,18 +1351,18 @@ P: Configuring package tasksel
 O: 
 P: Deconfiguring helper cdebootstrap-helper-apt
 O: (Reading database ... 
-O: 7164 files and directories currently installed.)
+O: 7179 files and directories currently installed.)
 O: Removing cdebootstrap-helper-apt ...
 P: Deconfiguring helper cdebootstrap-helper-diverts
 O: (Reading database ... 
-O: 7163 files and directories currently installed.)
+O: 7178 files and directories currently installed.)
 O: Removing cdebootstrap-helper-diverts ...
 O: Purging configuration files for cdebootstrap-helper-diverts ...
 O: Removing `diversion of /sbin/start-stop-daemon to /sbin/start-stop-daemon.REAL by cdebootstrap-helper-diverts'
 O: Removing `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by cdebootstrap-helper-diverts'
 P: Deconfiguring helper cdebootstrap-helper-makedev
 O: (Reading database ... 
-O: 7161 files and directories currently installed.)
+O: 7176 files and directories currently installed.)
 O: Removing cdebootstrap-helper-makedev ...
 O: Reading package lists...
 O: 
@@ -1360,7 +1377,7 @@ umount: /proc/bus/usb: not found
 umount: /dev/shm: not mounted
 umount: /proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//23917/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//26186/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
@@ -1368,8 +1385,8 @@ Refreshing the base.tgz
  -> installing dummy policy-rc.d
 Get:1 http://cdn.debian.or.jp sid Release.gpg [189B]
 Get:2 http://cdn.debian.or.jp sid Release [79.6kB]
-Get:3 http://cdn.debian.or.jp sid/main Packages [6174kB]
-Fetched 6253kB in 3s (1924kB/s)
+Get:3 http://cdn.debian.or.jp sid/main Packages [6219kB]
+Fetched XXkB in Xs (XXXXkB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -1392,78 +1409,78 @@ The following NEW packages will be installed:
   binutils build-essential cpp cpp-4.1 dpkg-dev g++ g++-4.1 gcc gcc-4.1
   libc6-dev libstdc++6-4.1-dev linux-libc-dev make patch perl perl-modules
 0 upgraded, 16 newly installed, 0 to remove and 0 not upgraded.
-Need to get 19.8MB of archives.
+Need to get 19.9MB of archives.
 After unpacking 78.5MB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main patch 2.5.9-4 [98.7kB]
 Get:2 http://cdn.debian.or.jp sid/main perl-modules 5.8.8-7 [2310kB]
 Get:3 http://cdn.debian.or.jp sid/main perl 5.8.8-7 [4240kB]
-Get:4 http://cdn.debian.or.jp sid/main binutils 2.17cvs20070426-6 [2554kB]
-Get:5 http://cdn.debian.or.jp sid/main linux-libc-dev 2.6.20-3 [668kB]
-Get:6 http://cdn.debian.or.jp sid/main libc6-dev 2.5-7 [2465kB]
-Get:7 http://cdn.debian.or.jp sid/main cpp-4.1 4.1.2-7 [2514kB]
+Get:4 http://cdn.debian.or.jp sid/main binutils 2.17cvs20070426-7 [2559kB]
+Get:5 http://cdn.debian.or.jp sid/main linux-libc-dev 2.6.21-4 [698kB]
+Get:6 http://cdn.debian.or.jp sid/main libc6-dev 2.5-9 [2472kB]
+Get:7 http://cdn.debian.or.jp sid/main cpp-4.1 4.1.2-8 [2514kB]
 Get:8 http://cdn.debian.or.jp sid/main cpp 4:4.1.2-2 [11.9kB]
-Get:9 http://cdn.debian.or.jp sid/main gcc-4.1 4.1.2-7 [440kB]
+Get:9 http://cdn.debian.or.jp sid/main gcc-4.1 4.1.2-8 [428kB]
 Get:10 http://cdn.debian.or.jp sid/main gcc 4:4.1.2-2 [5056B]
-Get:11 http://cdn.debian.or.jp sid/main libstdc++6-4.1-dev 4.1.2-7 [1155kB]
-Get:12 http://cdn.debian.or.jp sid/main g++-4.1 4.1.2-7 [2822kB]
+Get:11 http://cdn.debian.or.jp sid/main libstdc++6-4.1-dev 4.1.2-8 [1177kB]
+Get:12 http://cdn.debian.or.jp sid/main g++-4.1 4.1.2-8 [2822kB]
 Get:13 http://cdn.debian.or.jp sid/main g++ 4:4.1.2-2 [1374B]
 Get:14 http://cdn.debian.or.jp sid/main make 3.81-3 [395kB]
-Get:15 http://cdn.debian.or.jp sid/main dpkg-dev 1.14.3 [155kB]
+Get:15 http://cdn.debian.or.jp sid/main dpkg-dev 1.14.4 [178kB]
 Get:16 http://cdn.debian.or.jp sid/main build-essential 11.3 [6982B]
-Fetched 19.8MB in 9s (2135kB/s)
+Fetched 19.9MB in 25s (779kB/s)
 Selecting previously deselected package patch.
-(Reading database ... 7161 files and directories currently installed.)
+(Reading database ... 7176 files and directories currently installed.)
 Unpacking patch (from .../patch_2.5.9-4_amd64.deb) ...
 Selecting previously deselected package perl-modules.
 Unpacking perl-modules (from .../perl-modules_5.8.8-7_all.deb) ...
 Selecting previously deselected package perl.
 Unpacking perl (from .../perl_5.8.8-7_amd64.deb) ...
 Selecting previously deselected package binutils.
-Unpacking binutils (from .../binutils_2.17cvs20070426-6_amd64.deb) ...
+Unpacking binutils (from .../binutils_2.17cvs20070426-7_amd64.deb) ...
 Selecting previously deselected package linux-libc-dev.
-Unpacking linux-libc-dev (from .../linux-libc-dev_2.6.20-3_amd64.deb) ...
+Unpacking linux-libc-dev (from .../linux-libc-dev_2.6.21-4_amd64.deb) ...
 Selecting previously deselected package libc6-dev.
-Unpacking libc6-dev (from .../libc6-dev_2.5-7_amd64.deb) ...
+Unpacking libc6-dev (from .../libc6-dev_2.5-9_amd64.deb) ...
 Selecting previously deselected package cpp-4.1.
-Unpacking cpp-4.1 (from .../cpp-4.1_4.1.2-7_amd64.deb) ...
+Unpacking cpp-4.1 (from .../cpp-4.1_4.1.2-8_amd64.deb) ...
 Selecting previously deselected package cpp.
 Unpacking cpp (from .../cpp_4%3a4.1.2-2_amd64.deb) ...
 Selecting previously deselected package gcc-4.1.
-Unpacking gcc-4.1 (from .../gcc-4.1_4.1.2-7_amd64.deb) ...
+Unpacking gcc-4.1 (from .../gcc-4.1_4.1.2-8_amd64.deb) ...
 Selecting previously deselected package gcc.
 Unpacking gcc (from .../gcc_4%3a4.1.2-2_amd64.deb) ...
 Selecting previously deselected package libstdc++6-4.1-dev.
-Unpacking libstdc++6-4.1-dev (from .../libstdc++6-4.1-dev_4.1.2-7_amd64.deb) ...
+Unpacking libstdc++6-4.1-dev (from .../libstdc++6-4.1-dev_4.1.2-8_amd64.deb) ...
 Selecting previously deselected package g++-4.1.
-Unpacking g++-4.1 (from .../g++-4.1_4.1.2-7_amd64.deb) ...
+Unpacking g++-4.1 (from .../g++-4.1_4.1.2-8_amd64.deb) ...
 Selecting previously deselected package g++.
 Unpacking g++ (from .../g++_4%3a4.1.2-2_amd64.deb) ...
 Selecting previously deselected package make.
 Unpacking make (from .../archives/make_3.81-3_amd64.deb) ...
 Selecting previously deselected package dpkg-dev.
-Unpacking dpkg-dev (from .../dpkg-dev_1.14.3_all.deb) ...
+Unpacking dpkg-dev (from .../dpkg-dev_1.14.4_all.deb) ...
 Selecting previously deselected package build-essential.
 Unpacking build-essential (from .../build-essential_11.3_amd64.deb) ...
 Setting up patch (2.5.9-4) ...
-Setting up binutils (2.17cvs20070426-6) ...
+Setting up binutils (2.17cvs20070426-7) ...
 
-Setting up linux-libc-dev (2.6.20-3) ...
-Setting up libc6-dev (2.5-7) ...
-Setting up cpp-4.1 (4.1.2-7) ...
+Setting up linux-libc-dev (2.6.21-4) ...
+Setting up libc6-dev (2.5-9) ...
+Setting up cpp-4.1 (4.1.2-8) ...
 Setting up cpp (4:4.1.2-2) ...
 
-Setting up gcc-4.1 (4.1.2-7) ...
+Setting up gcc-4.1 (4.1.2-8) ...
 Setting up gcc (4:4.1.2-2) ...
 
 Setting up make (3.81-3) ...
 Setting up perl-modules (5.8.8-7) ...
-Setting up libstdc++6-4.1-dev (4.1.2-7) ...
+Setting up libstdc++6-4.1-dev (4.1.2-8) ...
 Setting up perl (5.8.8-7) ...
 
-Setting up g++-4.1 (4.1.2-7) ...
+Setting up g++-4.1 (4.1.2-8) ...
 Setting up g++ (4:4.1.2-2) ...
 
-Setting up dpkg-dev (1.14.3) ...
+Setting up dpkg-dev (1.14.4) ...
 Setting up build-essential (11.3) ...
 umount: /sys: not mounted
 umount: /run: not found
@@ -1472,9 +1489,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//23917/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//26186/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> creating base tarball [/TESTDIR/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//23917 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//26186 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-etch.log b/testsuite/cdebootstrap/pbuilder-execute-etch.log
index 5cfdb25..54b299f 100644
--- a/testsuite/cdebootstrap/pbuilder-execute-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-execute-etch.log
@@ -1,5 +1,5 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -10,4 +10,4 @@ Building the build Environment
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//32512 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//8828 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-lenny.log b/testsuite/cdebootstrap/pbuilder-execute-lenny.log
index 97398b5..de81784 100644
--- a/testsuite/cdebootstrap/pbuilder-execute-lenny.log
+++ b/testsuite/cdebootstrap/pbuilder-execute-lenny.log
@@ -1,5 +1,5 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -10,4 +10,4 @@ Building the build Environment
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//6596 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//18001 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-sid.log b/testsuite/cdebootstrap/pbuilder-execute-sid.log
index 157c5aa..adac3a0 100644
--- a/testsuite/cdebootstrap/pbuilder-execute-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-execute-sid.log
@@ -1,5 +1,5 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -10,4 +10,4 @@ Building the build Environment
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//28178 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//4263 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
index 582d84f..a34b6fa 100644
--- a/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
+++ b/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
@@ -16,7 +16,7 @@ Hit http://ftp.jp.debian.org sid Release
 Get:3 http://ftp.jp.debian.org experimental Release [79.6kB]
 Get:4 http://ftp.jp.debian.org sid/main Packages/DiffIndex [2038B]
 Get:5 http://ftp.jp.debian.org experimental/main Packages [739kB]
-Fetched 821kB in 14s (57.4kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
index 531619b..bfaa90d 100644
--- a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
@@ -1,6 +1,6 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
   -> Installing apt-lines
@@ -11,8 +11,8 @@ Refreshing the base.tgz
  -> upgrading packages
 Get:1 http://cdn.debian.or.jp sid Release.gpg [189B]
 Get:2 http://cdn.debian.or.jp sid Release [79.6kB]
-Get:3 http://cdn.debian.or.jp sid/main Packages [6174kB]
-Fetched 6253kB in 3s (1696kB/s)
+Get:3 http://cdn.debian.or.jp sid/main Packages [6219kB]
+Fetched XXkB in Xs (XXXXkB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -20,154 +20,194 @@ Building dependency tree...
 The following packages will be REMOVED:
   libsasl2 libssp0
 The following NEW packages will be installed:
-  libdevmapper1.02.1 liblzo2-2
+  gcc-4.2-base libdevmapper1.02.1 liblzo2-2
 The following packages will be upgraded:
-  binutils cpio cpp cpp-4.1 debianutils diff dpkg dpkg-dev dselect e2fslibs
-  e2fsprogs findutils g++ g++-4.1 gcc gcc-4.1 gcc-4.1-base info iputils-ping
-  libblkid1 libc6 libc6-dev libcomerr2 libgcc1 libgnutls13 libsasl2-2
+  binutils cpio cpp cpp-4.1 debianutils diff dmidecode dpkg dpkg-dev dselect
+  e2fslibs e2fsprogs findutils g++ g++-4.1 gcc gcc-4.1 gcc-4.1-base info
+  iputils-ping laptop-detect libblkid1 libbz2-1.0 libc6 libc6-dev libcomerr2
+  libgcc1 libgnutls13 libncurses5 libncursesw5 libreadline5 libsasl2-2
   libselinux1 libsepol1 libslang2 libss2 libssl0.9.8 libstdc++6
-  libstdc++6-4.1-dev libusb-0.1-4 libuuid1 login manpages nano passwd tzdata
-  vim-common vim-tiny zlib1g
-43 upgraded, 2 newly installed, 2 to remove and 0 not upgraded.
-Need to get 27.8MB of archives.
-After unpacking 1249kB of additional disk space will be used.
-Get:1 http://cdn.debian.or.jp sid/main libc6-dev 2.5-7 [2465kB]
-Get:2 http://cdn.debian.or.jp sid/main libc6 2.5-7 [4759kB]
-Get:3 http://cdn.debian.or.jp sid/main gcc-4.1-base 4.1.2-7 [202kB]
-Get:4 http://cdn.debian.or.jp sid/main libgcc1 1:4.1.2-7 [26.5kB]
-Get:5 http://cdn.debian.or.jp sid/main libstdc++6 4.1.2-7 [305kB]
-Get:6 http://cdn.debian.or.jp sid/main cpp-4.1 4.1.2-7 [2514kB]
-Get:7 http://cdn.debian.or.jp sid/main binutils 2.17cvs20070426-6 [2554kB]
-Get:8 http://cdn.debian.or.jp sid/main gcc-4.1 4.1.2-7 [440kB]
-Get:9 http://cdn.debian.or.jp sid/main g++-4.1 4.1.2-7 [2822kB]
-Get:10 http://cdn.debian.or.jp sid/main libstdc++6-4.1-dev 4.1.2-7 [1155kB]
-Get:11 http://cdn.debian.or.jp sid/main diff 2.8.1-12 [192kB]
-Get:12 http://cdn.debian.or.jp sid/main cpio 2.7-2 [114kB]
-Get:13 http://cdn.debian.or.jp sid/main dpkg-dev 1.14.3 [155kB]
-Get:14 http://cdn.debian.or.jp sid/main dpkg 1.14.3 [2059kB]
-Get:15 http://cdn.debian.or.jp sid/main e2fslibs 1.39+1.40-WIP-2007.04.07+dfsg-2 [111kB]
-Get:16 http://cdn.debian.or.jp sid/main e2fsprogs 1.39+1.40-WIP-2007.04.07+dfsg-2 [612kB]
-Get:17 http://cdn.debian.or.jp sid/main findutils 4.2.30-1 [361kB]
-Get:18 http://cdn.debian.or.jp sid/main login 1:4.0.18.1-8 [804kB]
-Get:19 http://cdn.debian.or.jp sid/main debianutils 2.18.1 [52.4kB]
-Get:20 http://cdn.debian.or.jp sid/main libsepol1 2.0.3-1 [126kB]
-Get:21 http://cdn.debian.or.jp sid/main libselinux1 2.0.15-2 [66.6kB]
-Get:22 http://cdn.debian.or.jp sid/main libdevmapper1.02.1 2:1.02.18-1 [47.4kB]
-Get:23 http://cdn.debian.or.jp sid/main libblkid1 1.39+1.40-WIP-2007.04.07+dfsg-2 [45.2kB]
-Get:24 http://cdn.debian.or.jp sid/main libcomerr2 1.39+1.40-WIP-2007.04.07+dfsg-2 [33.1kB]
-Get:25 http://cdn.debian.or.jp sid/main libslang2 2.0.7-1 [453kB]
-Get:26 http://cdn.debian.or.jp sid/main libss2 1.39+1.40-WIP-2007.04.07+dfsg-2 [39.0kB]
-Get:27 http://cdn.debian.or.jp sid/main libuuid1 1.39+1.40-WIP-2007.04.07+dfsg-2 [34.0kB]
-Get:28 http://cdn.debian.or.jp sid/main tzdata 2007f-2 [378kB]
-Get:29 http://cdn.debian.or.jp sid/main zlib1g 1:1.2.3-14 [73.2kB]
-Get:30 http://cdn.debian.or.jp sid/main info 4.8.dfsg.1-5 [176kB]
-Get:31 http://cdn.debian.or.jp sid/main iputils-ping 3:20070202-1 [45.5kB]
-Get:32 http://cdn.debian.or.jp sid/main liblzo2-2 2.02-2 [54.7kB]
-Get:33 http://cdn.debian.or.jp sid/main libgnutls13 1.6.2-2 [346kB]
-Get:34 http://cdn.debian.or.jp sid/main libsasl2-2 2.1.22.dfsg1-10 [107kB]
-Get:35 http://cdn.debian.or.jp sid/main libssl0.9.8 0.9.8e-5 [909kB]
-Get:36 http://cdn.debian.or.jp sid/main libusb-0.1-4 2:0.1.12-7 [20.4kB]
-Get:37 http://cdn.debian.or.jp sid/main manpages 2.46-1 [496kB]
-Get:38 http://cdn.debian.or.jp sid/main nano 2.0.6-1 [571kB]
-Get:39 http://cdn.debian.or.jp sid/main vim-tiny 1:7.1-000+1 [618kB]
-Get:40 http://cdn.debian.or.jp sid/main vim-common 1:7.1-000+1 [179kB]
-Get:41 http://cdn.debian.or.jp sid/main dselect 1.14.3 [492kB]
-Get:42 http://cdn.debian.or.jp sid/main passwd 1:4.0.18.1-8 [790kB]
-Get:43 http://cdn.debian.or.jp sid/main cpp 4:4.1.2-2 [11.9kB]
-Get:44 http://cdn.debian.or.jp sid/main gcc 4:4.1.2-2 [5056B]
-Get:45 http://cdn.debian.or.jp sid/main g++ 4:4.1.2-2 [1374B]
-
-Extracting templates from packages: 66%
-Extracting templates from packages: 100%
+  libstdc++6-4.1-dev libusb-0.1-4 libuuid1 login man-db manpages mktemp
+  module-init-tools nano ncurses-base ncurses-bin passwd readline-common sed
+  tzdata vim-common vim-tiny zlib1g
+56 upgraded, 3 newly installed, 2 to remove and 0 not upgraded.
+Need to get 30.6MB of archives.
+After unpacking 1552kB of additional disk space will be used.
+Get:1 http://cdn.debian.or.jp sid/main gcc-4.2-base 4.2-20070525-1 [209kB]
+Get:2 http://cdn.debian.or.jp sid/main binutils 2.17cvs20070426-7 [2559kB]
+Get:3 http://cdn.debian.or.jp sid/main libc6-dev 2.5-9 [2472kB]
+Get:4 http://cdn.debian.or.jp sid/main libc6 2.5-9 [4905kB]
+Get:5 http://cdn.debian.or.jp sid/main libgcc1 1:4.2-20070525-1 [26.7kB]
+Get:6 http://cdn.debian.or.jp sid/main libstdc++6 4.2-20070525-1 [312kB]
+Get:7 http://cdn.debian.or.jp sid/main libstdc++6-4.1-dev 4.1.2-8 [1177kB]
+Get:8 http://cdn.debian.or.jp sid/main g++-4.1 4.1.2-8 [2822kB]
+Get:9 http://cdn.debian.or.jp sid/main gcc-4.1 4.1.2-8 [428kB]
+Get:10 http://cdn.debian.or.jp sid/main cpp-4.1 4.1.2-8 [2514kB]
+Get:11 http://cdn.debian.or.jp sid/main gcc-4.1-base 4.1.2-8 [202kB]
+Get:12 http://cdn.debian.or.jp sid/main debianutils 2.19 [52.6kB]
+Get:13 http://cdn.debian.or.jp sid/main diff 2.8.1-12 [192kB]
+Get:14 http://cdn.debian.or.jp sid/main cpio 2.7-3 [115kB]
+Get:15 http://cdn.debian.or.jp sid/main dpkg-dev 1.14.4 [178kB]
+Get:16 http://cdn.debian.or.jp sid/main dpkg 1.14.4 [2080kB]
+Get:17 http://cdn.debian.or.jp sid/main e2fslibs 1.39+1.40-WIP-2007.04.07+dfsg-2 [111kB]
+Get:18 http://cdn.debian.or.jp sid/main e2fsprogs 1.39+1.40-WIP-2007.04.07+dfsg-2 [612kB]
+Get:19 http://cdn.debian.or.jp sid/main findutils 4.2.30-1 [361kB]
+Get:20 http://cdn.debian.or.jp sid/main login 1:4.0.18.1-9 [798kB]
+Get:21 http://cdn.debian.or.jp sid/main mktemp 1.5-3 [11.0kB]
+Get:22 http://cdn.debian.or.jp sid/main ncurses-bin 5.6-3 [235kB]
+Get:23 http://cdn.debian.or.jp sid/main sed 4.1.5-2 [253kB]
+Get:24 http://cdn.debian.or.jp sid/main libncurses5 5.6-3 [336kB]
+Get:25 http://cdn.debian.or.jp sid/main ncurses-base 5.6-3 [12.9kB]
+Get:26 http://cdn.debian.or.jp sid/main libsepol1 2.0.3-1 [126kB]
+Get:27 http://cdn.debian.or.jp sid/main libselinux1 2.0.15-2 [66.6kB]
+Get:28 http://cdn.debian.or.jp sid/main libdevmapper1.02.1 2:1.02.18-1 [47.4kB]
+Get:29 http://cdn.debian.or.jp sid/main libblkid1 1.39+1.40-WIP-2007.04.07+dfsg-2 [45.2kB]
+Get:30 http://cdn.debian.or.jp sid/main libcomerr2 1.39+1.40-WIP-2007.04.07+dfsg-2 [33.1kB]
+Get:31 http://cdn.debian.or.jp sid/main libslang2 2.0.7-1 [453kB]
+Get:32 http://cdn.debian.or.jp sid/main libss2 1.39+1.40-WIP-2007.04.07+dfsg-2 [39.0kB]
+Get:33 http://cdn.debian.or.jp sid/main libuuid1 1.39+1.40-WIP-2007.04.07+dfsg-2 [34.0kB]
+Get:34 http://cdn.debian.or.jp sid/main tzdata 2007f-4 [385kB]
+Get:35 http://cdn.debian.or.jp sid/main zlib1g 1:1.2.3-15 [73.5kB]
+Get:36 http://cdn.debian.or.jp sid/main dmidecode 2.9-1 [58.8kB]
+Get:37 http://cdn.debian.or.jp sid/main info 4.8.dfsg.1-6 [177kB]
+Get:38 http://cdn.debian.or.jp sid/main iputils-ping 3:20070202-1 [45.5kB]
+Get:39 http://cdn.debian.or.jp sid/main laptop-detect 0.13.1 [4574B]
+Get:40 http://cdn.debian.or.jp sid/main libbz2-1.0 1.0.3-7 [41.6kB]
+Get:41 http://cdn.debian.or.jp sid/main liblzo2-2 2.02-2 [54.7kB]
+Get:42 http://cdn.debian.or.jp sid/main libgnutls13 1.6.2-2 [346kB]
+Get:43 http://cdn.debian.or.jp sid/main libncursesw5 5.6-3 [358kB]
+Get:44 http://cdn.debian.or.jp sid/main readline-common 5.2-3 [50.8kB]
+Get:45 http://cdn.debian.or.jp sid/main libreadline5 5.2-3 [144kB]
+Get:46 http://cdn.debian.or.jp sid/main libsasl2-2 2.1.22.dfsg1-10 [107kB]
+Get:47 http://cdn.debian.or.jp sid/main libssl0.9.8 0.9.8e-5 [909kB]
+Get:48 http://cdn.debian.or.jp sid/main libusb-0.1-4 2:0.1.12-7 [20.4kB]
+Get:49 http://cdn.debian.or.jp sid/main man-db 2.4.4-3 [765kB]
+Get:50 http://cdn.debian.or.jp sid/main manpages 2.49-1 [495kB]
+Get:51 http://cdn.debian.or.jp sid/main module-init-tools 3.3-pre11-1 [85.3kB]
+Get:52 http://cdn.debian.or.jp sid/main nano 2.0.6-1 [571kB]
+Get:53 http://cdn.debian.or.jp sid/main vim-tiny 1:7.1-000+1 [618kB]
+Get:54 http://cdn.debian.or.jp sid/main vim-common 1:7.1-000+1 [179kB]
+Get:55 http://cdn.debian.or.jp sid/main dselect 1.14.4 [500kB]
+Get:56 http://cdn.debian.or.jp sid/main passwd 1:4.0.18.1-9 [788kB]
+Get:57 http://cdn.debian.or.jp sid/main cpp 4:4.1.2-2 [11.9kB]
+Get:58 http://cdn.debian.or.jp sid/main gcc 4:4.1.2-2 [5056B]
+Get:59 http://cdn.debian.or.jp sid/main g++ 4:4.1.2-2 [1374B]
+
+Extracting templates from packages: 50%
+Extracting templates from packages: 100%
 Preconfiguring packages ...
-Fetched 27.8MB in 4s (6718kB/s)
+Fetched 30.6MB in 3s (7709kB/s)
 (Reading database ... 12030 files and directories currently installed.)
 Removing libsasl2 ...
+Selecting previously deselected package gcc-4.2-base.
 (Reading database ... 12026 files and directories currently installed.)
-Preparing to replace libc6-dev 2.3.6.ds1-13 (using .../libc6-dev_2.5-7_amd64.deb) ...
+Unpacking gcc-4.2-base (from .../gcc-4.2-base_4.2-20070525-1_amd64.deb) ...
+Preparing to replace binutils 2.17-3 (using .../binutils_2.17cvs20070426-7_amd64.deb) ...
+Unpacking replacement binutils ...
+Preparing to replace libc6-dev 2.3.6.ds1-13 (using .../libc6-dev_2.5-9_amd64.deb) ...
 Unpacking replacement libc6-dev ...
-Preparing to replace libc6 2.3.6.ds1-13 (using .../archives/libc6_2.5-7_amd64.deb) ...
+Preparing to replace libc6 2.3.6.ds1-13 (using .../archives/libc6_2.5-9_amd64.deb) ...
 Unpacking replacement libc6 ...
-Setting up libc6 (2.5-7) ...
+Setting up libc6 (2.5-9) ...
 Installing new version of config file /etc/init.d/glibc.sh ...
 
-(Reading database ... 12091 files and directories currently installed.)
-Preparing to replace gcc-4.1-base 4.1.1-21 (using .../gcc-4.1-base_4.1.2-7_amd64.deb) ...
-Unpacking replacement gcc-4.1-base ...
-Preparing to replace libgcc1 1:4.1.1-21 (using .../libgcc1_1%3a4.1.2-7_amd64.deb) ...
+(Reading database ... 12100 files and directories currently installed.)
+Preparing to replace libgcc1 1:4.1.1-21 (using .../libgcc1_1%3a4.2-20070525-1_amd64.deb) ...
 Unpacking replacement libgcc1 ...
-Setting up gcc-4.1-base (4.1.2-7) ...
+Setting up gcc-4.2-base (4.2-20070525-1) ...
 
-Setting up libgcc1 (4.1.2-7) ...
+Setting up libgcc1 (4.2-20070525-1) ...
 
-(Reading database ... 12091 files and directories currently installed.)
-Preparing to replace libstdc++6 4.1.1-21 (using .../libstdc++6_4.1.2-7_amd64.deb) ...
+(Reading database ... 12100 files and directories currently installed.)
+Preparing to replace libstdc++6 4.1.1-21 (using .../libstdc++6_4.2-20070525-1_amd64.deb) ...
 Unpacking replacement libstdc++6 ...
-Setting up libstdc++6 (4.1.2-7) ...
+Setting up libstdc++6 (4.2-20070525-1) ...
 
-(Reading database ... 12091 files and directories currently installed.)
-Preparing to replace cpp-4.1 4.1.1-21 (using .../cpp-4.1_4.1.2-7_amd64.deb) ...
-Unpacking replacement cpp-4.1 ...
-Preparing to replace binutils 2.17-3 (using .../binutils_2.17cvs20070426-6_amd64.deb) ...
-Unpacking replacement binutils ...
-Preparing to replace gcc-4.1 4.1.1-21 (using .../gcc-4.1_4.1.2-7_amd64.deb) ...
-Unpacking replacement gcc-4.1 ...
-Preparing to replace g++-4.1 4.1.1-21 (using .../g++-4.1_4.1.2-7_amd64.deb) ...
-Unpacking replacement g++-4.1 ...
-Preparing to replace libstdc++6-4.1-dev 4.1.1-21 (using .../libstdc++6-4.1-dev_4.1.2-7_amd64.deb) ...
+(Reading database ... 12100 files and directories currently installed.)
+Preparing to replace libstdc++6-4.1-dev 4.1.1-21 (using .../libstdc++6-4.1-dev_4.1.2-8_amd64.deb) ...
 Unpacking replacement libstdc++6-4.1-dev ...
-(Reading database ... 12096 files and directories currently installed.)
+Preparing to replace g++-4.1 4.1.1-21 (using .../g++-4.1_4.1.2-8_amd64.deb) ...
+Unpacking replacement g++-4.1 ...
+Preparing to replace gcc-4.1 4.1.1-21 (using .../gcc-4.1_4.1.2-8_amd64.deb) ...
+Unpacking replacement gcc-4.1 ...
+Preparing to replace cpp-4.1 4.1.1-21 (using .../cpp-4.1_4.1.2-8_amd64.deb) ...
+Unpacking replacement cpp-4.1 ...
+(Reading database ... 12100 files and directories currently installed.)
 Removing libssp0 ...
-(Reading database ... 12093 files and directories currently installed.)
+(Reading database ... 12097 files and directories currently installed.)
+Preparing to replace gcc-4.1-base 4.1.1-21 (using .../gcc-4.1-base_4.1.2-8_amd64.deb) ...
+Unpacking replacement gcc-4.1-base ...
+Preparing to replace debianutils 2.18 (using .../debianutils_2.19_amd64.deb) ...
+Unpacking replacement debianutils ...
+Setting up debianutils (2.19) ...
+
+(Reading database ... 12097 files and directories currently installed.)
 Preparing to replace diff 2.8.1-11 (using .../diff_2.8.1-12_amd64.deb) ...
 Unpacking replacement diff ...
 Setting up diff (2.8.1-12) ...
-(Reading database ... 12093 files and directories currently installed.)
-Preparing to replace cpio 2.7-1 (using .../archives/cpio_2.7-2_amd64.deb) ...
+(Reading database ... 12097 files and directories currently installed.)
+Preparing to replace cpio 2.7-1 (using .../archives/cpio_2.7-3_amd64.deb) ...
 Unpacking replacement cpio ...
-Preparing to replace dpkg-dev 1.13.25 (using .../dpkg-dev_1.14.3_all.deb) ...
+Preparing to replace dpkg-dev 1.13.25 (using .../dpkg-dev_1.14.4_all.deb) ...
 Unpacking replacement dpkg-dev ...
-Preparing to replace dpkg 1.13.25 (using .../archives/dpkg_1.14.3_amd64.deb) ...
+Preparing to replace dpkg 1.13.25 (using .../archives/dpkg_1.14.4_amd64.deb) ...
 Unpacking replacement dpkg ...
-Setting up dpkg (1.14.3) ...
+Setting up dpkg (1.14.4) ...
 
-(Reading database ... 12073 files and directories currently installed.)
+(Reading database ... 12096 files and directories currently installed.)
 Preparing to replace e2fslibs 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../e2fslibs_1.39+1.40-WIP-2007.04.07+dfsg-2_amd64.deb) ...
 Unpacking replacement e2fslibs ...
 Setting up e2fslibs (1.39+1.40-WIP-2007.04.07+dfsg-2) ...
 
-(Reading database ... 12073 files and directories currently installed.)
+(Reading database ... 12096 files and directories currently installed.)
 Preparing to replace e2fsprogs 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../e2fsprogs_1.39+1.40-WIP-2007.04.07+dfsg-2_amd64.deb) ...
 Unpacking replacement e2fsprogs ...
 Setting up e2fsprogs (1.39+1.40-WIP-2007.04.07+dfsg-2) ...
-(Reading database ... 12073 files and directories currently installed.)
+(Reading database ... 12096 files and directories currently installed.)
 Preparing to replace findutils 4.2.28-2 (using .../findutils_4.2.30-1_amd64.deb) ...
 Unpacking replacement findutils ...
 Setting up findutils (4.2.30-1) ...
 
-(Reading database ... 12073 files and directories currently installed.)
-Preparing to replace login 1:4.0.18.1-7 (using .../login_1%3a4.0.18.1-8_amd64.deb) ...
+(Reading database ... 12096 files and directories currently installed.)
+Preparing to replace login 1:4.0.18.1-7 (using .../login_1%3a4.0.18.1-9_amd64.deb) ...
 Unpacking replacement login ...
-Setting up login (1:4.0.18.1-8) ...
+Setting up login (1:4.0.18.1-9) ...
 Installing new version of config file /etc/login.defs ...
 
-(Reading database ... 12073 files and directories currently installed.)
-Preparing to replace debianutils 2.18 (using .../debianutils_2.18.1_amd64.deb) ...
-Unpacking replacement debianutils ...
-Setting up debianutils (2.18.1) ...
-
-(Reading database ... 12073 files and directories currently installed.)
+(Reading database ... 12096 files and directories currently installed.)
+Preparing to replace mktemp 1.5-2 (using .../mktemp_1.5-3_amd64.deb) ...
+Unpacking replacement mktemp ...
+Setting up mktemp (1.5-3) ...
+(Reading database ... 12096 files and directories currently installed.)
+Preparing to replace ncurses-bin 5.5-5 (using .../ncurses-bin_5.6-3_amd64.deb) ...
+Unpacking replacement ncurses-bin ...
+Setting up ncurses-bin (5.6-3) ...
+(Reading database ... 12097 files and directories currently installed.)
+Preparing to replace sed 4.1.5-1 (using .../archives/sed_4.1.5-2_amd64.deb) ...
+Unpacking replacement sed ...
+Setting up sed (4.1.5-2) ...
+
+(Reading database ... 12097 files and directories currently installed.)
+Preparing to replace libncurses5 5.5-5 (using .../libncurses5_5.6-3_amd64.deb) ...
+Unpacking replacement libncurses5 ...
+Setting up libncurses5 (5.6-3) ...
+
+(Reading database ... 12097 files and directories currently installed.)
+Preparing to replace ncurses-base 5.5-5 (using .../ncurses-base_5.6-3_all.deb) ...
+Unpacking replacement ncurses-base ...
+Setting up ncurses-base (5.6-3) ...
+(Reading database ... 12097 files and directories currently installed.)
 Preparing to replace libsepol1 1.14-3 (using .../libsepol1_2.0.3-1_amd64.deb) ...
 Unpacking replacement libsepol1 ...
 Setting up libsepol1 (2.0.3-1) ...
 telinit: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 12073 files and directories currently installed.)
+(Reading database ... 12097 files and directories currently installed.)
 Preparing to replace libselinux1 1.32-3 (using .../libselinux1_2.0.15-2_amd64.deb) ...
 Unpacking replacement libselinux1 ...
 Setting up libselinux1 (2.0.15-2) ...
 init: timeout opening/writing control channel /dev/initctl
 
 Selecting previously deselected package libdevmapper1.02.1.
-(Reading database ... 12073 files and directories currently installed.)
+(Reading database ... 12097 files and directories currently installed.)
 Unpacking libdevmapper1.02.1 (from .../libdevmapper1.02.1_2%3a1.02.18-1_amd64.deb) ...
 Preparing to replace libblkid1 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../libblkid1_1.39+1.40-WIP-2007.04.07+dfsg-2_amd64.deb) ...
 Unpacking replacement libblkid1 ...
@@ -175,68 +215,84 @@ Setting up libdevmapper1.02.1 (2:1.02.18-1) ...
 
 Setting up libblkid1 (1.39+1.40-WIP-2007.04.07+dfsg-2) ...
 
-(Reading database ... 12079 files and directories currently installed.)
+(Reading database ... 12103 files and directories currently installed.)
 Preparing to replace libcomerr2 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../libcomerr2_1.39+1.40-WIP-2007.04.07+dfsg-2_amd64.deb) ...
 Unpacking replacement libcomerr2 ...
 Setting up libcomerr2 (1.39+1.40-WIP-2007.04.07+dfsg-2) ...
 
-(Reading database ... 12079 files and directories currently installed.)
+(Reading database ... 12103 files and directories currently installed.)
 Preparing to replace libslang2 2.0.6-4 (using .../libslang2_2.0.7-1_amd64.deb) ...
 Unpacking replacement libslang2 ...
 Setting up libslang2 (2.0.7-1) ...
 
-(Reading database ... 12079 files and directories currently installed.)
+(Reading database ... 12103 files and directories currently installed.)
 Preparing to replace libss2 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../libss2_1.39+1.40-WIP-2007.04.07+dfsg-2_amd64.deb) ...
 Unpacking replacement libss2 ...
 Setting up libss2 (1.39+1.40-WIP-2007.04.07+dfsg-2) ...
 
-(Reading database ... 12079 files and directories currently installed.)
+(Reading database ... 12103 files and directories currently installed.)
 Preparing to replace libuuid1 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../libuuid1_1.39+1.40-WIP-2007.04.07+dfsg-2_amd64.deb) ...
 Unpacking replacement libuuid1 ...
 Setting up libuuid1 (1.39+1.40-WIP-2007.04.07+dfsg-2) ...
 
-(Reading database ... 12079 files and directories currently installed.)
-Preparing to replace tzdata 2007f-1 (using .../tzdata_2007f-2_all.deb) ...
+(Reading database ... 12103 files and directories currently installed.)
+Preparing to replace tzdata 2007f-3 (using .../tzdata_2007f-4_all.deb) ...
 Unpacking replacement tzdata ...
-Setting up tzdata (2007f-2) ...
+Setting up tzdata (2007f-4) ...
 
 Current default timezone: 'Etc/UTC'
-Local time is now:      Thu May 17 03:34:03 UTC 2007.
-Universal Time is now:  Thu May 17 03:34:03 UTC 2007.
+Local time is now:      Sun May 27 02:44:19 UTC 2007.
+Universal Time is now:  Sun May 27 02:44:19 UTC 2007.
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
 
-(Reading database ... 12079 files and directories currently installed.)
-Preparing to replace zlib1g 1:1.2.3-13 (using .../zlib1g_1%3a1.2.3-14_amd64.deb) ...
+(Reading database ... 12103 files and directories currently installed.)
+Preparing to replace zlib1g 1:1.2.3-13 (using .../zlib1g_1%3a1.2.3-15_amd64.deb) ...
 Unpacking replacement zlib1g ...
-Setting up zlib1g (1:1.2.3-14) ...
+Setting up zlib1g (1:1.2.3-15) ...
 
-(Reading database ... 12079 files and directories currently installed.)
-Preparing to replace info 4.8.dfsg.1-4 (using .../info_4.8.dfsg.1-5_amd64.deb) ...
+(Reading database ... 12103 files and directories currently installed.)
+Preparing to replace dmidecode 2.8-4 (using .../dmidecode_2.9-1_amd64.deb) ...
+Unpacking replacement dmidecode ...
+Preparing to replace info 4.8.dfsg.1-4 (using .../info_4.8.dfsg.1-6_amd64.deb) ...
 Unpacking replacement info ...
 Preparing to replace iputils-ping 3:20020927-6 (using .../iputils-ping_3%3a20070202-1_amd64.deb) ...
 Unpacking replacement iputils-ping ...
+Preparing to replace laptop-detect 0.12.1-0.1 (using .../laptop-detect_0.13.1_amd64.deb) ...
+Unpacking replacement laptop-detect ...
+Preparing to replace libbz2-1.0 1.0.3-6 (using .../libbz2-1.0_1.0.3-7_amd64.deb) ...
+Unpacking replacement libbz2-1.0 ...
 Selecting previously deselected package liblzo2-2.
 Unpacking liblzo2-2 (from .../liblzo2-2_2.02-2_amd64.deb) ...
 Preparing to replace libgnutls13 1.4.4-3 (using .../libgnutls13_1.6.2-2_amd64.deb) ...
 Unpacking replacement libgnutls13 ...
+Preparing to replace libncursesw5 5.5-5 (using .../libncursesw5_5.6-3_amd64.deb) ...
+Unpacking replacement libncursesw5 ...
+Preparing to replace readline-common 5.2-2 (using .../readline-common_5.2-3_all.deb) ...
+Unpacking replacement readline-common ...
+Preparing to replace libreadline5 5.2-2 (using .../libreadline5_5.2-3_amd64.deb) ...
+Unpacking replacement libreadline5 ...
 Preparing to replace libsasl2-2 2.1.22.dfsg1-8 (using .../libsasl2-2_2.1.22.dfsg1-10_amd64.deb) ...
 Unpacking replacement libsasl2-2 ...
 Preparing to replace libssl0.9.8 0.9.8e-4 (using .../libssl0.9.8_0.9.8e-5_amd64.deb) ...
 Unpacking replacement libssl0.9.8 ...
 Preparing to replace libusb-0.1-4 2:0.1.12-6 (using .../libusb-0.1-4_2%3a0.1.12-7_amd64.deb) ...
 Unpacking replacement libusb-0.1-4 ...
-Preparing to replace manpages 2.43-0 (using .../manpages_2.46-1_all.deb) ...
+Preparing to replace man-db 2.4.4-2 (using .../man-db_2.4.4-3_amd64.deb) ...
+Unpacking replacement man-db ...
+Preparing to replace manpages 2.43-0 (using .../manpages_2.49-1_all.deb) ...
 Unpacking replacement manpages ...
+Preparing to replace module-init-tools 3.3-pre4-2 (using .../module-init-tools_3.3-pre11-1_amd64.deb) ...
+Unpacking replacement module-init-tools ...
 Preparing to replace nano 2.0.3-1 (using .../nano_2.0.6-1_amd64.deb) ...
 Unpacking replacement nano ...
 Preparing to replace vim-tiny 1:7.0-219+1 (using .../vim-tiny_1%3a7.1-000+1_amd64.deb) ...
 Unpacking replacement vim-tiny ...
 Preparing to replace vim-common 1:7.0-219+1 (using .../vim-common_1%3a7.1-000+1_amd64.deb) ...
 Unpacking replacement vim-common ...
-Preparing to replace dselect 1.13.25 (using .../dselect_1.14.3_amd64.deb) ...
+Preparing to replace dselect 1.13.25 (using .../dselect_1.14.4_amd64.deb) ...
 Unpacking replacement dselect ...
-Preparing to replace passwd 1:4.0.18.1-7 (using .../passwd_1%3a4.0.18.1-8_amd64.deb) ...
+Preparing to replace passwd 1:4.0.18.1-7 (using .../passwd_1%3a4.0.18.1-9_amd64.deb) ...
 Unpacking replacement passwd ...
 Preparing to replace cpp 4:4.1.1-15 (using .../cpp_4%3a4.1.2-2_amd64.deb) ...
 Unpacking replacement cpp ...
@@ -245,44 +301,60 @@ Removing old gcc doc directory.
 Unpacking replacement gcc ...
 Preparing to replace g++ 4:4.1.1-15 (using .../g++_4%3a4.1.2-2_amd64.deb) ...
 Unpacking replacement g++ ...
-Setting up libc6-dev (2.5-7) ...
-Setting up cpp-4.1 (4.1.2-7) ...
-Setting up binutils (2.17cvs20070426-6) ...
+Setting up binutils (2.17cvs20070426-7) ...
 
-Setting up gcc-4.1 (4.1.2-7) ...
-Setting up cpio (2.7-2) ...
+Setting up libc6-dev (2.5-9) ...
+Setting up gcc-4.1-base (4.1.2-8) ...
 
-Setting up dpkg-dev (1.14.3) ...
-Setting up info (4.8.dfsg.1-5) ...
+Setting up cpp-4.1 (4.1.2-8) ...
+Setting up gcc-4.1 (4.1.2-8) ...
+Setting up cpio (2.7-3) ...
+
+Setting up dpkg-dev (1.14.4) ...
+Setting up dmidecode (2.9-1) ...
+Setting up info (4.8.dfsg.1-6) ...
 
 Setting up iputils-ping (3:20070202-1) ...
+Setting up laptop-detect (0.13.1) ...
+Setting up libbz2-1.0 (1.0.3-7) ...
+
 Setting up liblzo2-2 (2.02-2) ...
 
 Setting up libgnutls13 (1.6.2-2) ...
 
+Setting up libncursesw5 (5.6-3) ...
+
+Setting up readline-common (5.2-3) ...
+
+Setting up libreadline5 (5.2-3) ...
+
 Setting up libsasl2-2 (2.1.22.dfsg1-10) ...
 
 Setting up libssl0.9.8 (0.9.8e-5) ...
 
 Setting up libusb-0.1-4 (2:0.1.12-7) ...
 
-Setting up manpages (2.46-1) ...
+Setting up man-db (2.4.4-3) ...
+
+Setting up manpages (2.49-1) ...
+Setting up module-init-tools (3.3-pre11-1) ...
+
 Setting up nano (2.0.6-1) ...
 
 Setting up vim-common (1:7.1-000+1) ...
 
 Setting up vim-tiny (1:7.1-000+1) ...
 
-Setting up dselect (1.14.3) ...
-Setting up passwd (1:4.0.18.1-8) ...
+Setting up dselect (1.14.4) ...
+Setting up passwd (1:4.0.18.1-9) ...
 Installing new version of config file /etc/default/useradd ...
 
 Setting up cpp (4:4.1.2-2) ...
 
 Setting up gcc (4:4.1.2-2) ...
 
-Setting up libstdc++6-4.1-dev (4.1.2-7) ...
-Setting up g++-4.1 (4.1.2-7) ...
+Setting up libstdc++6-4.1-dev (4.1.2-8) ...
+Setting up g++-4.1 (4.1.2-8) ...
 Setting up g++ (4:4.1.2-2) ...
 
 Reading package lists...
@@ -298,9 +370,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//940/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//9829/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> creating base tarball [/TESTDIR/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//940 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//9829 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-etch.log b/testsuite/cdebootstrap/pdebuild-internal-etch.log
index 2f98c18..0aaa0c9 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-etch.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-etch.log
@@ -1,11 +1,11 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2
+-> Mounting /TESTDIR/dir2
  -> policy-rc.d already exists
 Reading package lists...
 Building dependency tree...
@@ -25,7 +25,7 @@ Get:1 http://cdn.debian.or.jp etch/main libdebian-installer4 0.50 [27.3kB]
 Get:2 http://cdn.debian.or.jp etch/main libdebian-installer-extra4 0.50 [10.5kB]
 Get:3 http://cdn.debian.or.jp etch/main cdebootstrap 0.3.15 [26.7kB]
 Get:4 http://cdn.debian.or.jp etch/main pbuilder 0.161 [82.6kB]
-Fetched 147kB in 0s (192kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package libdebian-installer4.
 (Reading database ... 12033 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.50_amd64.deb) ...
@@ -73,7 +73,7 @@ Get:7 http://cdn.debian.or.jp etch/main po-debconf 1.0.8 [111kB]
 Get:8 http://cdn.debian.or.jp etch/main debhelper 5.0.42 [510kB]
 Get:9 http://cdn.debian.or.jp etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3482kB in 4s (784kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12127 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-5etch1_amd64.deb) ...
@@ -119,7 +119,7 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp etch/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (513kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12797 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
@@ -135,14 +135,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -337,18 +337,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 Making all in m4
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -361,26 +361,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 Making check in m4
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -418,8 +418,8 @@ success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
-c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+c: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -427,11 +427,11 @@ dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
 success
 PASS: tests/param-r-invalid.sh
-1: 1
 2: 2
+1: 1
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Thu May 17 03:31:46 UTC 2007
+Sun May 27 02:41:28 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -501,7 +501,7 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Thu May 17 03:31:51 UTC 2007
+Sun May 27 02:41:33 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -517,9 +517,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -527,58 +527,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+/usr/bin/make install DESTDIR=/TESTDIR/dir2/dsh-0.25.7/debian/dsh
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 Making install in m4
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
 	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
 	    /usr/bin/install -c -m 644 ./$file \
-			    /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
+			    /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-test -z "/usr/bin" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
+test -z "/usr/bin" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/dsh.conf /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+cp /TESTDIR/dir2/dsh-0.25.7/debian/machines.list /TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
+cp /TESTDIR/dir2/dsh-0.25.7/dsh.conf /TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
+install -d /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
+install -m 755 /TESTDIR/dir2/dsh-0.25.7/debian/dsh.updatelist /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -599,8 +599,8 @@ dpkg-deb: building package `dsh' in `../dsh_0.25.7-1_amd64.deb'.
  dpkg-genchanges
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
- -> unmounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2 filesystem
+ -> unmounting /TESTDIR/dir2 filesystem
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir3/26718 and its subdirectories
+    -> removing directory /TESTDIR/dir3/2917 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-lenny.log b/testsuite/cdebootstrap/pdebuild-internal-lenny.log
index d2278c1..c546d35 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-lenny.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-lenny.log
@@ -1,11 +1,11 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2
+-> Mounting /TESTDIR/dir2
  -> policy-rc.d already exists
 Reading package lists...
 Building dependency tree...
@@ -25,7 +25,7 @@ Get:1 http://cdn.debian.or.jp lenny/main libdebian-installer4 0.50 [27.3kB]
 Get:2 http://cdn.debian.or.jp lenny/main libdebian-installer-extra4 0.50 [10.5kB]
 Get:3 http://cdn.debian.or.jp lenny/main cdebootstrap 0.3.15 [26.7kB]
 Get:4 http://cdn.debian.or.jp lenny/main pbuilder 0.161 [82.6kB]
-Fetched 147kB in 0s (499kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package libdebian-installer4.
 (Reading database ... 12030 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.50_amd64.deb) ...
@@ -73,7 +73,7 @@ Get:7 http://cdn.debian.or.jp lenny/main po-debconf 1.0.8 [111kB]
 Get:8 http://cdn.debian.or.jp lenny/main debhelper 5.0.49 [517kB]
 Get:9 http://cdn.debian.or.jp lenny/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp lenny/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3545kB in 1s (2437kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12124 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.20-4_amd64.deb) ...
@@ -119,7 +119,7 @@ The following NEW packages will be installed:
 Need to get 103kB of archives.
 After unpacking 430kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp lenny/main fakeroot 1.6.5 [103kB]
-Fetched 103kB in 0s (474kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12799 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.6.5_amd64.deb) ...
@@ -135,14 +135,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -337,18 +337,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 Making all in m4
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -361,26 +361,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 Making check in m4
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -431,7 +431,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Thu May 17 03:40:42 UTC 2007
+Sun May 27 02:54:14 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -501,14 +501,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Thu May 17 03:40:47 UTC 2007
+Sun May 27 02:54:19 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
+dsh: Process terminated (before write).
 b: b
 c: c
-dsh: Process terminated (before write).
-a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -517,9 +517,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -527,58 +527,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+/usr/bin/make install DESTDIR=/TESTDIR/dir2/dsh-0.25.7/debian/dsh
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 Making install in m4
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
 	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
 	    /usr/bin/install -c -m 644 ./$file \
-			    /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
+			    /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-test -z "/usr/bin" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
+test -z "/usr/bin" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/dsh.conf /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+cp /TESTDIR/dir2/dsh-0.25.7/debian/machines.list /TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
+cp /TESTDIR/dir2/dsh-0.25.7/dsh.conf /TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
+install -d /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
+install -m 755 /TESTDIR/dir2/dsh-0.25.7/debian/dsh.updatelist /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -599,8 +599,8 @@ dpkg-deb: building package `dsh' in `../dsh_0.25.7-1_amd64.deb'.
  dpkg-genchanges
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
- -> unmounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2 filesystem
+ -> unmounting /TESTDIR/dir2 filesystem
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir3/678 and its subdirectories
+    -> removing directory /TESTDIR/dir3/12215 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-sid.log b/testsuite/cdebootstrap/pdebuild-internal-sid.log
index d62ae3f..dea947b 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-sid.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-sid.log
@@ -1,11 +1,11 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2
+-> Mounting /TESTDIR/dir2
  -> policy-rc.d already exists
 Reading package lists...
 Building dependency tree...
@@ -25,9 +25,9 @@ Get:1 http://cdn.debian.or.jp sid/main libdebian-installer4 0.51 [28.1kB]
 Get:2 http://cdn.debian.or.jp sid/main libdebian-installer-extra4 0.51 [10.6kB]
 Get:3 http://cdn.debian.or.jp sid/main cdebootstrap 0.4.3 [29.0kB]
 Get:4 http://cdn.debian.or.jp sid/main pbuilder 0.166 [85.8kB]
-Fetched 153kB in 0s (1564kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 11040 files and directories currently installed.)
+(Reading database ... 11070 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.51_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.51_amd64.deb) ...
@@ -61,10 +61,10 @@ The following NEW packages will be installed:
   debhelper file gettext gettext-base html2text intltool-debian libdshconfig1
   libdshconfig1-dev libmagic1 po-debconf
 0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
-Need to get 3546kB of archives.
+Need to get 3549kB of archives.
 After unpacking 12.0MB of additional disk space will be used.
-Get:1 http://cdn.debian.or.jp sid/main libmagic1 4.20-5 [327kB]
-Get:2 http://cdn.debian.or.jp sid/main file 4.20-5 [39.2kB]
+Get:1 http://cdn.debian.or.jp sid/main libmagic1 4.20-8 [329kB]
+Get:2 http://cdn.debian.or.jp sid/main file 4.20-8 [39.6kB]
 Get:3 http://cdn.debian.or.jp sid/main gettext-base 0.16.1-1 [132kB]
 Get:4 http://cdn.debian.or.jp sid/main html2text 1.3.2a-3 [92.7kB]
 Get:5 http://cdn.debian.or.jp sid/main gettext 0.16.1-1 [2261kB]
@@ -73,12 +73,12 @@ Get:7 http://cdn.debian.or.jp sid/main po-debconf 1.0.8 [111kB]
 Get:8 http://cdn.debian.or.jp sid/main debhelper 5.0.49 [517kB]
 Get:9 http://cdn.debian.or.jp sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3546kB in 0s (3829kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11139 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.20-5_amd64.deb) ...
+(Reading database ... 11169 files and directories currently installed.)
+Unpacking libmagic1 (from .../libmagic1_4.20-8_amd64.deb) ...
 Selecting previously deselected package file.
-Unpacking file (from .../archives/file_4.20-5_amd64.deb) ...
+Unpacking file (from .../archives/file_4.20-8_amd64.deb) ...
 Selecting previously deselected package gettext-base.
 Unpacking gettext-base (from .../gettext-base_0.16.1-1_amd64.deb) ...
 Selecting previously deselected package html2text.
@@ -95,9 +95,9 @@ Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.12-2_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
 Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.12-2_amd64.deb) ...
-Setting up libmagic1 (4.20-5) ...
+Setting up libmagic1 (4.20-8) ...
 
-Setting up file (4.20-5) ...
+Setting up file (4.20-8) ...
 Setting up gettext-base (0.16.1-1) ...
 
 Setting up html2text (1.3.2a-3) ...
@@ -119,9 +119,9 @@ The following NEW packages will be installed:
 Need to get 111kB of archives.
 After unpacking 451kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main fakeroot 1.7.1 [111kB]
-Fetched 111kB in 0s (1026kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11814 files and directories currently installed.)
+(Reading database ... 11844 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.7.1_amd64.deb) ...
 Setting up fakeroot (1.7.1) ...
 
@@ -135,14 +135,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -337,18 +337,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 Making all in m4
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -361,26 +361,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 Making check in m4
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -392,7 +392,6 @@ test to check that unknown parameter checking is right.
 PASS: tests/param-unknown.sh
 test1
 test2
-dsh: Process terminated (before write).
 PASS: tests/param-i.sh
 Check that cn4 option is working.
 PASS: tests/param-cn4.sh
@@ -416,10 +415,10 @@ success
 success
 success
 success
-a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+a: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -427,11 +426,11 @@ dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
 success
 PASS: tests/param-r-invalid.sh
-1: 1
 2: 2
+1: 1
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Thu May 17 03:24:50 UTC 2007
+Sun May 27 02:34:29 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -501,13 +500,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Thu May 17 03:24:55 UTC 2007
+Sun May 27 02:34:34 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-c: c
+dsh: Process terminated (before write).
 b: b
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -516,9 +516,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -526,58 +526,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+/usr/bin/make install DESTDIR=/TESTDIR/dir2/dsh-0.25.7/debian/dsh
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 Making install in m4
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
 	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
 	    /usr/bin/install -c -m 644 ./$file \
-			    /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
+			    /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-test -z "/usr/bin" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
+test -z "/usr/bin" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/dsh.conf /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+cp /TESTDIR/dir2/dsh-0.25.7/debian/machines.list /TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
+cp /TESTDIR/dir2/dsh-0.25.7/dsh.conf /TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
+install -d /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
+install -m 755 /TESTDIR/dir2/dsh-0.25.7/debian/dsh.updatelist /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -598,8 +598,8 @@ dpkg-deb: building package `dsh' in `../dsh_0.25.7-1_amd64.deb'.
  dpkg-genchanges
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
- -> unmounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2 filesystem
+ -> unmounting /TESTDIR/dir2 filesystem
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir3/22389 and its subdirectories
+    -> removing directory /TESTDIR/dir3/30905 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-etch.log b/testsuite/cdebootstrap/pdebuild-normal-etch.log
index a6a7da6..be9a42f 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-etch.log
+++ b/testsuite/cdebootstrap/pdebuild-normal-etch.log
@@ -7,14 +7,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -28,10 +28,10 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: source only upload (original source is included)
 W: /home/dancer/.pbuilderrc does not exist
 I: using fakeroot in build.
-Current time: Thu May 17 12:30:05 JST 2007
-pbuilder-time-stamp: 1179372605
+Current time: TIME
+pbuilder-time-stamp: XXXX
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -70,7 +70,7 @@ Get:7 http://cdn.debian.or.jp etch/main po-debconf 1.0.8 [111kB]
 Get:8 http://cdn.debian.or.jp etch/main debhelper 5.0.42 [510kB]
 Get:9 http://cdn.debian.or.jp etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3482kB in 1s (2338kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12033 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-5etch1_amd64.deb) ...
@@ -116,7 +116,7 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp etch/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (168kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12703 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
@@ -440,9 +440,9 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
-b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+b: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -454,7 +454,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Thu May 17 03:30:51 UTC 2007
+Sun May 27 02:40:27 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -524,7 +524,7 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Thu May 17 03:30:56 UTC 2007
+Sun May 27 02:40:32 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -636,7 +636,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Thu May 17 12:30:58 JST 2007
-pbuilder-time-stamp: 1179372658
+Current time: TIME
+pbuilder-time-stamp: XXXX
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir3/20920 and its subdirectories
+    -> removing directory /TESTDIR/dir3/29507 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-lenny.log b/testsuite/cdebootstrap/pdebuild-normal-lenny.log
index f3eb779..7c7c4fa 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-lenny.log
+++ b/testsuite/cdebootstrap/pdebuild-normal-lenny.log
@@ -7,14 +7,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -28,10 +28,10 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: source only upload (original source is included)
 W: /home/dancer/.pbuilderrc does not exist
 I: using fakeroot in build.
-Current time: Thu May 17 12:39:02 JST 2007
-pbuilder-time-stamp: 1179373142
+Current time: TIME
+pbuilder-time-stamp: XXXX
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -70,7 +70,7 @@ Get:7 http://cdn.debian.or.jp lenny/main po-debconf 1.0.8 [111kB]
 Get:8 http://cdn.debian.or.jp lenny/main debhelper 5.0.49 [517kB]
 Get:9 http://cdn.debian.or.jp lenny/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp lenny/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3545kB in 0s (5508kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12030 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.20-4_amd64.deb) ...
@@ -116,7 +116,7 @@ The following NEW packages will be installed:
 Need to get 103kB of archives.
 After unpacking 430kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp lenny/main fakeroot 1.6.5 [103kB]
-Fetched 103kB in 0s (330kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12705 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.6.5_amd64.deb) ...
@@ -440,9 +440,9 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
+d: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -454,7 +454,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Thu May 17 03:39:48 UTC 2007
+Sun May 27 02:53:07 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -524,14 +524,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Thu May 17 03:39:53 UTC 2007
+Sun May 27 02:53:12 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
 b: b
 c: c
 dsh: Process terminated (before write).
-a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -636,7 +636,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Thu May 17 12:39:54 JST 2007
-pbuilder-time-stamp: 1179373194
+Current time: TIME
+pbuilder-time-stamp: XXXX
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir3/27345 and its subdirectories
+    -> removing directory /TESTDIR/dir3/6416 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-sid.log b/testsuite/cdebootstrap/pdebuild-normal-sid.log
index 99c29f8..5a25ea7 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-sid.log
+++ b/testsuite/cdebootstrap/pdebuild-normal-sid.log
@@ -7,14 +7,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -28,10 +28,10 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: source only upload (original source is included)
 W: /home/dancer/.pbuilderrc does not exist
 I: using fakeroot in build.
-Current time: Thu May 17 12:23:12 JST 2007
-pbuilder-time-stamp: 1179372192
+Current time: TIME
+pbuilder-time-stamp: XXXX
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -57,10 +57,10 @@ The following NEW packages will be installed:
   debhelper file gettext gettext-base html2text intltool-debian libdshconfig1
   libdshconfig1-dev libmagic1 po-debconf
 0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
-Need to get 3546kB of archives.
+Need to get 3549kB of archives.
 After unpacking 12.0MB of additional disk space will be used.
-Get:1 http://cdn.debian.or.jp sid/main libmagic1 4.20-5 [327kB]
-Get:2 http://cdn.debian.or.jp sid/main file 4.20-5 [39.2kB]
+Get:1 http://cdn.debian.or.jp sid/main libmagic1 4.20-8 [329kB]
+Get:2 http://cdn.debian.or.jp sid/main file 4.20-8 [39.6kB]
 Get:3 http://cdn.debian.or.jp sid/main gettext-base 0.16.1-1 [132kB]
 Get:4 http://cdn.debian.or.jp sid/main html2text 1.3.2a-3 [92.7kB]
 Get:5 http://cdn.debian.or.jp sid/main gettext 0.16.1-1 [2261kB]
@@ -69,12 +69,12 @@ Get:7 http://cdn.debian.or.jp sid/main po-debconf 1.0.8 [111kB]
 Get:8 http://cdn.debian.or.jp sid/main debhelper 5.0.49 [517kB]
 Get:9 http://cdn.debian.or.jp sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3546kB in 2s (1352kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11040 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.20-5_amd64.deb) ...
+(Reading database ... 11070 files and directories currently installed.)
+Unpacking libmagic1 (from .../libmagic1_4.20-8_amd64.deb) ...
 Selecting previously deselected package file.
-Unpacking file (from .../archives/file_4.20-5_amd64.deb) ...
+Unpacking file (from .../archives/file_4.20-8_amd64.deb) ...
 Selecting previously deselected package gettext-base.
 Unpacking gettext-base (from .../gettext-base_0.16.1-1_amd64.deb) ...
 Selecting previously deselected package html2text.
@@ -91,9 +91,9 @@ Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.12-2_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
 Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.12-2_amd64.deb) ...
-Setting up libmagic1 (4.20-5) ...
+Setting up libmagic1 (4.20-8) ...
 
-Setting up file (4.20-5) ...
+Setting up file (4.20-8) ...
 Setting up gettext-base (0.16.1-1) ...
 
 Setting up html2text (1.3.2a-3) ...
@@ -115,9 +115,9 @@ The following NEW packages will be installed:
 Need to get 111kB of archives.
 After unpacking 451kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main fakeroot 1.7.1 [111kB]
-Fetched 111kB in 0s (595kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11715 files and directories currently installed.)
+(Reading database ... 11745 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.7.1_amd64.deb) ...
 Setting up fakeroot (1.7.1) ...
 
@@ -399,7 +399,6 @@ test to check that unknown parameter checking is right.
 PASS: tests/param-unknown.sh
 test1
 test2
-dsh: Process terminated (before write).
 PASS: tests/param-i.sh
 Check that cn4 option is working.
 PASS: tests/param-cn4.sh
@@ -434,11 +433,11 @@ dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
 success
 PASS: tests/param-r-invalid.sh
-2: 2
 1: 1
+2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Thu May 17 03:23:58 UTC 2007
+Sun May 27 02:33:26 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -508,12 +507,13 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Thu May 17 03:24:03 UTC 2007
+Sun May 27 02:33:31 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-b: b
 a: a
+dsh: Process terminated (before write).
+b: b
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -609,7 +609,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Thu May 17 12:24:05 JST 2007
-pbuilder-time-stamp: 1179372245
+Current time: TIME
+pbuilder-time-stamp: XXXX
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir3/16601 and its subdirectories
+    -> removing directory /TESTDIR/dir3/25051 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-etch.log b/testsuite/normal/pbuilder-build-dsh-etch.log
index 5dba574..512a66c 100644
--- a/testsuite/normal/pbuilder-build-dsh-etch.log
+++ b/testsuite/normal/pbuilder-build-dsh-etch.log
@@ -1,8 +1,8 @@
 I: using fakeroot in build.
-Current time: Thu May 17 12:07:57 JST 2007
-pbuilder-time-stamp: 1179371277
+Current time: TIME
+pbuilder-time-stamp: XXXX
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -41,7 +41,7 @@ Get:7 http://cdn.debian.or.jp etch/main po-debconf 1.0.8 [111kB]
 Get:8 http://cdn.debian.or.jp etch/main debhelper 5.0.42 [510kB]
 Get:9 http://cdn.debian.or.jp etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3482kB in 1s (1851kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12033 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-5etch1_amd64.deb) ...
@@ -87,16 +87,16 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp etch/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (1173kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12703 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
 Setting up fakeroot (1.5.10) ...
 
 Copying source file
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir1/dsh_0.25.7-1.dsc]
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir1/dsh_0.25.7.orig.tar.gz]
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir1/dsh_0.25.7-1.diff.gz]
+    -> copying [/TESTDIR/dir1/dsh_0.25.7-1.dsc]
+    -> copying [/TESTDIR/dir1/dsh_0.25.7.orig.tar.gz]
+    -> copying [/TESTDIR/dir1/dsh_0.25.7-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 gpg: can't open `/gnupg/options.skel': No such file or directory
@@ -410,9 +410,9 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
+d: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -420,11 +420,11 @@ dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
 success
 PASS: tests/param-r-invalid.sh
-1: 1
 2: 2
+1: 1
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Thu May 17 03:08:39 UTC 2007
+Sun May 27 02:09:04 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -494,14 +494,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Thu May 17 03:08:44 UTC 2007
+Sun May 27 02:09:09 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
 b: b
-c: c
 dsh: Process terminated (before write).
-a: a
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -606,7 +606,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Thu May 17 12:08:47 JST 2007
-pbuilder-time-stamp: 1179371327
+Current time: TIME
+pbuilder-time-stamp: XXXX
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir1/5462 and its subdirectories
+    -> removing directory /TESTDIR/dir1/22861 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-lenny.log b/testsuite/normal/pbuilder-build-dsh-lenny.log
index 82957bf..ac499ac 100644
--- a/testsuite/normal/pbuilder-build-dsh-lenny.log
+++ b/testsuite/normal/pbuilder-build-dsh-lenny.log
@@ -1,8 +1,8 @@
 I: using fakeroot in build.
-Current time: Thu May 17 12:15:07 JST 2007
-pbuilder-time-stamp: 1179371707
+Current time: TIME
+pbuilder-time-stamp: XXXX
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -41,7 +41,7 @@ Get:7 http://cdn.debian.or.jp lenny/main po-debconf 1.0.8 [111kB]
 Get:8 http://cdn.debian.or.jp lenny/main debhelper 5.0.49 [517kB]
 Get:9 http://cdn.debian.or.jp lenny/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp lenny/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3545kB in 0s (6254kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12030 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.20-4_amd64.deb) ...
@@ -87,16 +87,16 @@ The following NEW packages will be installed:
 Need to get 103kB of archives.
 After unpacking 430kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp lenny/main fakeroot 1.6.5 [103kB]
-Fetched 103kB in 0s (363kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12705 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.6.5_amd64.deb) ...
 Setting up fakeroot (1.6.5) ...
 
 Copying source file
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir1/dsh_0.25.7-1.dsc]
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir1/dsh_0.25.7.orig.tar.gz]
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir1/dsh_0.25.7-1.diff.gz]
+    -> copying [/TESTDIR/dir1/dsh_0.25.7-1.dsc]
+    -> copying [/TESTDIR/dir1/dsh_0.25.7.orig.tar.gz]
+    -> copying [/TESTDIR/dir1/dsh_0.25.7-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 gpg: can't open `/gnupg/options.skel': No such file or directory
@@ -410,9 +410,9 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
-b: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
+d: dsh: Failed executing ./invalid-exec-file with llexec call
+b: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -424,7 +424,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Thu May 17 03:15:49 UTC 2007
+Sun May 27 02:21:44 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -494,14 +494,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Thu May 17 03:15:54 UTC 2007
+Sun May 27 02:21:49 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-c: c
-dsh: Process terminated (before write).
 a: a
 b: b
+c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -606,7 +606,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Thu May 17 12:15:56 JST 2007
-pbuilder-time-stamp: 1179371756
+Current time: TIME
+pbuilder-time-stamp: XXXX
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir1/5038 and its subdirectories
+    -> removing directory /TESTDIR/dir1/5145 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-sid.log b/testsuite/normal/pbuilder-build-dsh-sid.log
index f86958a..6bd13ea 100644
--- a/testsuite/normal/pbuilder-build-dsh-sid.log
+++ b/testsuite/normal/pbuilder-build-dsh-sid.log
@@ -1,8 +1,8 @@
 I: using fakeroot in build.
-Current time: Thu May 17 12:02:49 JST 2007
-pbuilder-time-stamp: 1179370969
+Current time: TIME
+pbuilder-time-stamp: XXXX
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -28,10 +28,10 @@ The following NEW packages will be installed:
   debhelper file gettext gettext-base html2text intltool-debian libdshconfig1
   libdshconfig1-dev libmagic1 po-debconf
 0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
-Need to get 3546kB of archives.
+Need to get 3549kB of archives.
 After unpacking 12.0MB of additional disk space will be used.
-Get:1 http://cdn.debian.or.jp sid/main libmagic1 4.20-5 [327kB]
-Get:2 http://cdn.debian.or.jp sid/main file 4.20-5 [39.2kB]
+Get:1 http://cdn.debian.or.jp sid/main libmagic1 4.20-8 [329kB]
+Get:2 http://cdn.debian.or.jp sid/main file 4.20-8 [39.6kB]
 Get:3 http://cdn.debian.or.jp sid/main gettext-base 0.16.1-1 [132kB]
 Get:4 http://cdn.debian.or.jp sid/main html2text 1.3.2a-3 [92.7kB]
 Get:5 http://cdn.debian.or.jp sid/main gettext 0.16.1-1 [2261kB]
@@ -40,12 +40,12 @@ Get:7 http://cdn.debian.or.jp sid/main po-debconf 1.0.8 [111kB]
 Get:8 http://cdn.debian.or.jp sid/main debhelper 5.0.49 [517kB]
 Get:9 http://cdn.debian.or.jp sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3546kB in 1s (2579kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11040 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.20-5_amd64.deb) ...
+(Reading database ... 11070 files and directories currently installed.)
+Unpacking libmagic1 (from .../libmagic1_4.20-8_amd64.deb) ...
 Selecting previously deselected package file.
-Unpacking file (from .../archives/file_4.20-5_amd64.deb) ...
+Unpacking file (from .../archives/file_4.20-8_amd64.deb) ...
 Selecting previously deselected package gettext-base.
 Unpacking gettext-base (from .../gettext-base_0.16.1-1_amd64.deb) ...
 Selecting previously deselected package html2text.
@@ -62,9 +62,9 @@ Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.12-2_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
 Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.12-2_amd64.deb) ...
-Setting up libmagic1 (4.20-5) ...
+Setting up libmagic1 (4.20-8) ...
 
-Setting up file (4.20-5) ...
+Setting up file (4.20-8) ...
 Setting up gettext-base (0.16.1-1) ...
 
 Setting up html2text (1.3.2a-3) ...
@@ -86,16 +86,16 @@ The following NEW packages will be installed:
 Need to get 111kB of archives.
 After unpacking 451kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main fakeroot 1.7.1 [111kB]
-Fetched 111kB in 0s (581kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11715 files and directories currently installed.)
+(Reading database ... 11745 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.7.1_amd64.deb) ...
 Setting up fakeroot (1.7.1) ...
 
 Copying source file
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir1/dsh_0.25.7-1.dsc]
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir1/dsh_0.25.7.orig.tar.gz]
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir1/dsh_0.25.7-1.diff.gz]
+    -> copying [/TESTDIR/dir1/dsh_0.25.7-1.dsc]
+    -> copying [/TESTDIR/dir1/dsh_0.25.7.orig.tar.gz]
+    -> copying [/TESTDIR/dir1/dsh_0.25.7-1.diff.gz]
 Extracting source
 gpg: can't open `/gnupg/options.skel': No such file or directory
 gpg: Signature made Fri Aug 11 14:17:58 2006 UTC using DSA key ID E81E55C1
@@ -396,9 +396,9 @@ success
 success
 success
 b: dsh: Failed executing ./invalid-exec-file with llexec call
-c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
 a: dsh: Failed executing ./invalid-exec-file with llexec call
+c: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -410,7 +410,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Thu May 17 03:03:40 UTC 2007
+Sun May 27 02:03:05 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -423,6 +423,18 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 DUMPing parameters passed to llexec
 [2] 
+3: Using sleep as the remote shell
+3: Show machine names on output
+3: Adding machine 5,4,3,2,1 to list
+3: Setting forklimit to 3 and wait_shell to 0
+3: DUMPing parameters passed to llexec
+3: [3] 
+Using sleep as the remote shell
+Show machine names on output
+Adding machine 5,4,3,2,1 to list
+Setting forklimit to 3 and wait_shell to 0
+DUMPing parameters passed to llexec
+[3] 
 1: Using sleep as the remote shell
 1: Show machine names on output
 1: Adding machine 5,4,3,2,1 to list
@@ -468,14 +480,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Thu May 17 03:03:45 UTC 2007
+Sun May 27 02:03:10 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-c: c
-dsh: Process terminated (before write).
 a: a
 b: b
+c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -570,7 +582,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Thu May 17 12:03:47 JST 2007
-pbuilder-time-stamp: 1179371027
+Current time: TIME
+pbuilder-time-stamp: XXXX
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir1/7938 and its subdirectories
+    -> removing directory /TESTDIR/dir1/25248 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-etch.log b/testsuite/normal/pbuilder-create-etch.log
index 2115358..a7c9612 100644
--- a/testsuite/normal/pbuilder-create-etch.log
+++ b/testsuite/normal/pbuilder-create-etch.log
@@ -583,7 +583,7 @@ umount: /dev/shm: not mounted
 umount: proc: not mounted
 umount: proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//25577/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//10584/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
@@ -593,7 +593,7 @@ Get:1 http://cdn.debian.or.jp etch Release.gpg [378B]
 Hit http://cdn.debian.or.jp etch Release
 Ign http://cdn.debian.or.jp etch/main Packages/DiffIndex
 Hit http://cdn.debian.or.jp etch/main Packages
-Fetched 378B in 0s (1616B/s)
+Fetched 378B in 0s (1388B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -637,7 +637,7 @@ Get:14 http://cdn.debian.or.jp etch/main g++ 4:4.1.1-15 [1358B]
 Get:15 http://cdn.debian.or.jp etch/main make 3.81-2 [390kB]
 Get:16 http://cdn.debian.or.jp etch/main dpkg-dev 1.13.25 [166kB]
 Get:17 http://cdn.debian.or.jp etch/main build-essential 11.3 [6982B]
-Fetched 21.2MB in 9s (2339kB/s)
+Fetched 21.2MB in 17s (1191kB/s)
 Selecting previously deselected package patch.
 (Reading database ... 7112 files and directories currently installed.)
 Unpacking patch (from .../patch_2.5.9-4_amd64.deb) ...
@@ -703,9 +703,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//25577/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//10584/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> creating base tarball [/TESTDIR/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//25577 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//10584 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-lenny.log b/testsuite/normal/pbuilder-create-lenny.log
index 741695e..1e17fde 100644
--- a/testsuite/normal/pbuilder-create-lenny.log
+++ b/testsuite/normal/pbuilder-create-lenny.log
@@ -583,7 +583,7 @@ umount: /dev/shm: not mounted
 umount: proc: not mounted
 umount: proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//25137/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//19719/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
@@ -592,7 +592,7 @@ Refreshing the base.tgz
 Get:1 http://cdn.debian.or.jp lenny Release.gpg [189B]
 Hit http://cdn.debian.or.jp lenny Release
 Get:2 http://cdn.debian.or.jp lenny/main Packages/DiffIndex [2038B]
-Fetched 2227B in 0s (4948B/s)
+Fetched 2227B in 0s (8612B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -635,7 +635,7 @@ Get:14 http://cdn.debian.or.jp lenny/main g++ 4:4.1.1-15 [1358B]
 Get:15 http://cdn.debian.or.jp lenny/main make 3.81-3 [395kB]
 Get:16 http://cdn.debian.or.jp lenny/main dpkg-dev 1.13.25 [166kB]
 Get:17 http://cdn.debian.or.jp lenny/main build-essential 11.3 [6982B]
-Fetched 21.2MB in 2s (7194kB/s)
+Fetched 21.2MB in 8s (2645kB/s)
 Selecting previously deselected package patch.
 (Reading database ... 7109 files and directories currently installed.)
 Unpacking patch (from .../patch_2.5.9-4_amd64.deb) ...
@@ -701,9 +701,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//25137/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//19719/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> creating base tarball [/TESTDIR/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//25137 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//19719 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-sid.log b/testsuite/normal/pbuilder-create-sid.log
index 5195734..de71f3e 100644
--- a/testsuite/normal/pbuilder-create-sid.log
+++ b/testsuite/normal/pbuilder-create-sid.log
@@ -63,6 +63,8 @@ I: Retrieving findutils
 I: Validating findutils
 I: Retrieving gcc-4.1-base
 I: Validating gcc-4.1-base
+I: Retrieving gcc-4.2-base
+I: Validating gcc-4.2-base
 I: Retrieving gnupg
 I: Validating gnupg
 I: Retrieving gpgv
@@ -272,6 +274,7 @@ I: Extracting e2fslibs...
 I: Extracting e2fsprogs...
 I: Extracting findutils...
 I: Extracting gcc-4.1-base...
+I: Extracting gcc-4.2-base...
 I: Extracting grep...
 I: Extracting gzip...
 I: Extracting hostname...
@@ -335,6 +338,7 @@ I: Unpacking e2fslibs...
 I: Unpacking e2fsprogs...
 I: Unpacking findutils...
 I: Unpacking gcc-4.1-base...
+I: Unpacking gcc-4.2-base...
 I: Unpacking grep...
 I: Unpacking gzip...
 I: Unpacking hostname...
@@ -384,6 +388,7 @@ I: Unpacking zlib1g...
 I: Configuring required packages...
 I: Configuring sysv-rc...
 I: Configuring gcc-4.1-base...
+I: Configuring gcc-4.2-base...
 I: Configuring libpam-runtime...
 I: Configuring libc6...
 I: Configuring libcap1...
@@ -584,7 +589,7 @@ umount: /dev/shm: not mounted
 umount: proc: not mounted
 umount: proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//28092/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//12944/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
@@ -593,7 +598,7 @@ Refreshing the base.tgz
 Get:1 http://cdn.debian.or.jp sid Release.gpg [189B]
 Hit http://cdn.debian.or.jp sid Release
 Get:2 http://cdn.debian.or.jp sid/main Packages/DiffIndex [2038B]
-Fetched 2227B in 0s (6631B/s)
+Fetched 2227B in 0s (8015B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -616,78 +621,78 @@ The following NEW packages will be installed:
   binutils build-essential cpp cpp-4.1 dpkg-dev g++ g++-4.1 gcc gcc-4.1
   libc6-dev libstdc++6-4.1-dev linux-libc-dev make patch perl perl-modules
 0 upgraded, 16 newly installed, 0 to remove and 0 not upgraded.
-Need to get 19.8MB of archives.
+Need to get 19.9MB of archives.
 After unpacking 78.5MB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main patch 2.5.9-4 [98.7kB]
 Get:2 http://cdn.debian.or.jp sid/main perl-modules 5.8.8-7 [2310kB]
 Get:3 http://cdn.debian.or.jp sid/main perl 5.8.8-7 [4240kB]
-Get:4 http://cdn.debian.or.jp sid/main binutils 2.17cvs20070426-6 [2554kB]
-Get:5 http://cdn.debian.or.jp sid/main linux-libc-dev 2.6.20-3 [668kB]
-Get:6 http://cdn.debian.or.jp sid/main libc6-dev 2.5-7 [2465kB]
-Get:7 http://cdn.debian.or.jp sid/main cpp-4.1 4.1.2-7 [2514kB]
+Get:4 http://cdn.debian.or.jp sid/main binutils 2.17cvs20070426-7 [2559kB]
+Get:5 http://cdn.debian.or.jp sid/main linux-libc-dev 2.6.21-4 [698kB]
+Get:6 http://cdn.debian.or.jp sid/main libc6-dev 2.5-9 [2472kB]
+Get:7 http://cdn.debian.or.jp sid/main cpp-4.1 4.1.2-8 [2514kB]
 Get:8 http://cdn.debian.or.jp sid/main cpp 4:4.1.2-2 [11.9kB]
-Get:9 http://cdn.debian.or.jp sid/main gcc-4.1 4.1.2-7 [440kB]
+Get:9 http://cdn.debian.or.jp sid/main gcc-4.1 4.1.2-8 [428kB]
 Get:10 http://cdn.debian.or.jp sid/main gcc 4:4.1.2-2 [5056B]
-Get:11 http://cdn.debian.or.jp sid/main libstdc++6-4.1-dev 4.1.2-7 [1155kB]
-Get:12 http://cdn.debian.or.jp sid/main g++-4.1 4.1.2-7 [2822kB]
+Get:11 http://cdn.debian.or.jp sid/main libstdc++6-4.1-dev 4.1.2-8 [1177kB]
+Get:12 http://cdn.debian.or.jp sid/main g++-4.1 4.1.2-8 [2822kB]
 Get:13 http://cdn.debian.or.jp sid/main g++ 4:4.1.2-2 [1374B]
 Get:14 http://cdn.debian.or.jp sid/main make 3.81-3 [395kB]
-Get:15 http://cdn.debian.or.jp sid/main dpkg-dev 1.14.3 [155kB]
+Get:15 http://cdn.debian.or.jp sid/main dpkg-dev 1.14.4 [178kB]
 Get:16 http://cdn.debian.or.jp sid/main build-essential 11.3 [6982B]
-Fetched 19.8MB in 5s (3373kB/s)
+Fetched 19.9MB in 6s (2957kB/s)
 Selecting previously deselected package patch.
-(Reading database ... 7161 files and directories currently installed.)
+(Reading database ... 7176 files and directories currently installed.)
 Unpacking patch (from .../patch_2.5.9-4_amd64.deb) ...
 Selecting previously deselected package perl-modules.
 Unpacking perl-modules (from .../perl-modules_5.8.8-7_all.deb) ...
 Selecting previously deselected package perl.
 Unpacking perl (from .../perl_5.8.8-7_amd64.deb) ...
 Selecting previously deselected package binutils.
-Unpacking binutils (from .../binutils_2.17cvs20070426-6_amd64.deb) ...
+Unpacking binutils (from .../binutils_2.17cvs20070426-7_amd64.deb) ...
 Selecting previously deselected package linux-libc-dev.
-Unpacking linux-libc-dev (from .../linux-libc-dev_2.6.20-3_amd64.deb) ...
+Unpacking linux-libc-dev (from .../linux-libc-dev_2.6.21-4_amd64.deb) ...
 Selecting previously deselected package libc6-dev.
-Unpacking libc6-dev (from .../libc6-dev_2.5-7_amd64.deb) ...
+Unpacking libc6-dev (from .../libc6-dev_2.5-9_amd64.deb) ...
 Selecting previously deselected package cpp-4.1.
-Unpacking cpp-4.1 (from .../cpp-4.1_4.1.2-7_amd64.deb) ...
+Unpacking cpp-4.1 (from .../cpp-4.1_4.1.2-8_amd64.deb) ...
 Selecting previously deselected package cpp.
 Unpacking cpp (from .../cpp_4%3a4.1.2-2_amd64.deb) ...
 Selecting previously deselected package gcc-4.1.
-Unpacking gcc-4.1 (from .../gcc-4.1_4.1.2-7_amd64.deb) ...
+Unpacking gcc-4.1 (from .../gcc-4.1_4.1.2-8_amd64.deb) ...
 Selecting previously deselected package gcc.
 Unpacking gcc (from .../gcc_4%3a4.1.2-2_amd64.deb) ...
 Selecting previously deselected package libstdc++6-4.1-dev.
-Unpacking libstdc++6-4.1-dev (from .../libstdc++6-4.1-dev_4.1.2-7_amd64.deb) ...
+Unpacking libstdc++6-4.1-dev (from .../libstdc++6-4.1-dev_4.1.2-8_amd64.deb) ...
 Selecting previously deselected package g++-4.1.
-Unpacking g++-4.1 (from .../g++-4.1_4.1.2-7_amd64.deb) ...
+Unpacking g++-4.1 (from .../g++-4.1_4.1.2-8_amd64.deb) ...
 Selecting previously deselected package g++.
 Unpacking g++ (from .../g++_4%3a4.1.2-2_amd64.deb) ...
 Selecting previously deselected package make.
 Unpacking make (from .../archives/make_3.81-3_amd64.deb) ...
 Selecting previously deselected package dpkg-dev.
-Unpacking dpkg-dev (from .../dpkg-dev_1.14.3_all.deb) ...
+Unpacking dpkg-dev (from .../dpkg-dev_1.14.4_all.deb) ...
 Selecting previously deselected package build-essential.
 Unpacking build-essential (from .../build-essential_11.3_amd64.deb) ...
 Setting up patch (2.5.9-4) ...
-Setting up binutils (2.17cvs20070426-6) ...
+Setting up binutils (2.17cvs20070426-7) ...
 
-Setting up linux-libc-dev (2.6.20-3) ...
-Setting up libc6-dev (2.5-7) ...
-Setting up cpp-4.1 (4.1.2-7) ...
+Setting up linux-libc-dev (2.6.21-4) ...
+Setting up libc6-dev (2.5-9) ...
+Setting up cpp-4.1 (4.1.2-8) ...
 Setting up cpp (4:4.1.2-2) ...
 
-Setting up gcc-4.1 (4.1.2-7) ...
+Setting up gcc-4.1 (4.1.2-8) ...
 Setting up gcc (4:4.1.2-2) ...
 
 Setting up make (3.81-3) ...
 Setting up perl-modules (5.8.8-7) ...
-Setting up libstdc++6-4.1-dev (4.1.2-7) ...
+Setting up libstdc++6-4.1-dev (4.1.2-8) ...
 Setting up perl (5.8.8-7) ...
 
-Setting up g++-4.1 (4.1.2-7) ...
+Setting up g++-4.1 (4.1.2-8) ...
 Setting up g++ (4:4.1.2-2) ...
 
-Setting up dpkg-dev (1.14.3) ...
+Setting up dpkg-dev (1.14.4) ...
 Setting up build-essential (11.3) ...
 umount: /sys: not mounted
 umount: /run: not found
@@ -696,9 +701,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//28092/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//12944/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> creating base tarball [/TESTDIR/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//28092 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//12944 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-etch.log b/testsuite/normal/pbuilder-execute-etch.log
index 0cffe1c..f0133c3 100644
--- a/testsuite/normal/pbuilder-execute-etch.log
+++ b/testsuite/normal/pbuilder-execute-etch.log
@@ -1,5 +1,5 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -10,4 +10,4 @@ Building the build Environment
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//23059 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//8136 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-lenny.log b/testsuite/normal/pbuilder-execute-lenny.log
index 37d86c9..e04b70a 100644
--- a/testsuite/normal/pbuilder-execute-lenny.log
+++ b/testsuite/normal/pbuilder-execute-lenny.log
@@ -1,5 +1,5 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -10,4 +10,4 @@ Building the build Environment
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//22636 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//24394 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-sid.log b/testsuite/normal/pbuilder-execute-sid.log
index adfee0c..5d35f1d 100644
--- a/testsuite/normal/pbuilder-execute-sid.log
+++ b/testsuite/normal/pbuilder-execute-sid.log
@@ -1,5 +1,5 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -10,4 +10,4 @@ Building the build Environment
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//25521 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//10528 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-etch-sid-experimental.log b/testsuite/normal/pbuilder-update-etch-sid-experimental.log
index fa38dda..760fb8c 100644
--- a/testsuite/normal/pbuilder-update-etch-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-etch-sid-experimental.log
@@ -16,7 +16,7 @@ Hit http://ftp.jp.debian.org sid Release
 Get:3 http://ftp.jp.debian.org experimental Release [79.6kB]
 Get:4 http://ftp.jp.debian.org sid/main Packages/DiffIndex [2038B]
 Get:5 http://ftp.jp.debian.org experimental/main Packages [739kB]
-Fetched 821kB in 12s (68.3kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
diff --git a/testsuite/normal/pbuilder-update-etch-sid.log b/testsuite/normal/pbuilder-update-etch-sid.log
index 6aa675b..1f67484 100644
--- a/testsuite/normal/pbuilder-update-etch-sid.log
+++ b/testsuite/normal/pbuilder-update-etch-sid.log
@@ -1,6 +1,6 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
   -> Installing apt-lines
@@ -11,8 +11,8 @@ Refreshing the base.tgz
  -> upgrading packages
 Get:1 http://cdn.debian.or.jp sid Release.gpg [189B]
 Get:2 http://cdn.debian.or.jp sid Release [79.6kB]
-Get:3 http://cdn.debian.or.jp sid/main Packages [6174kB]
-Fetched 6253kB in 3s (1780kB/s)
+Get:3 http://cdn.debian.or.jp sid/main Packages [6219kB]
+Fetched XXkB in Xs (XXXXkB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -20,154 +20,194 @@ Building dependency tree...
 The following packages will be REMOVED:
   libsasl2 libssp0
 The following NEW packages will be installed:
-  libdevmapper1.02.1 liblzo2-2
+  gcc-4.2-base libdevmapper1.02.1 liblzo2-2
 The following packages will be upgraded:
-  binutils cpio cpp cpp-4.1 debianutils diff dpkg dpkg-dev dselect e2fslibs
-  e2fsprogs findutils g++ g++-4.1 gcc gcc-4.1 gcc-4.1-base info iputils-ping
-  libblkid1 libc6 libc6-dev libcomerr2 libgcc1 libgnutls13 libsasl2-2
+  binutils cpio cpp cpp-4.1 debianutils diff dmidecode dpkg dpkg-dev dselect
+  e2fslibs e2fsprogs findutils g++ g++-4.1 gcc gcc-4.1 gcc-4.1-base info
+  iputils-ping laptop-detect libblkid1 libbz2-1.0 libc6 libc6-dev libcomerr2
+  libgcc1 libgnutls13 libncurses5 libncursesw5 libreadline5 libsasl2-2
   libselinux1 libsepol1 libslang2 libss2 libssl0.9.8 libstdc++6
-  libstdc++6-4.1-dev libusb-0.1-4 libuuid1 login manpages nano passwd tzdata
-  vim-common vim-tiny zlib1g
-43 upgraded, 2 newly installed, 2 to remove and 0 not upgraded.
-Need to get 27.8MB of archives.
-After unpacking 1249kB of additional disk space will be used.
-Get:1 http://cdn.debian.or.jp sid/main libc6-dev 2.5-7 [2465kB]
-Get:2 http://cdn.debian.or.jp sid/main libc6 2.5-7 [4759kB]
-Get:3 http://cdn.debian.or.jp sid/main gcc-4.1-base 4.1.2-7 [202kB]
-Get:4 http://cdn.debian.or.jp sid/main libgcc1 1:4.1.2-7 [26.5kB]
-Get:5 http://cdn.debian.or.jp sid/main libstdc++6 4.1.2-7 [305kB]
-Get:6 http://cdn.debian.or.jp sid/main cpp-4.1 4.1.2-7 [2514kB]
-Get:7 http://cdn.debian.or.jp sid/main binutils 2.17cvs20070426-6 [2554kB]
-Get:8 http://cdn.debian.or.jp sid/main gcc-4.1 4.1.2-7 [440kB]
-Get:9 http://cdn.debian.or.jp sid/main g++-4.1 4.1.2-7 [2822kB]
-Get:10 http://cdn.debian.or.jp sid/main libstdc++6-4.1-dev 4.1.2-7 [1155kB]
-Get:11 http://cdn.debian.or.jp sid/main diff 2.8.1-12 [192kB]
-Get:12 http://cdn.debian.or.jp sid/main cpio 2.7-2 [114kB]
-Get:13 http://cdn.debian.or.jp sid/main dpkg-dev 1.14.3 [155kB]
-Get:14 http://cdn.debian.or.jp sid/main dpkg 1.14.3 [2059kB]
-Get:15 http://cdn.debian.or.jp sid/main e2fslibs 1.39+1.40-WIP-2007.04.07+dfsg-2 [111kB]
-Get:16 http://cdn.debian.or.jp sid/main e2fsprogs 1.39+1.40-WIP-2007.04.07+dfsg-2 [612kB]
-Get:17 http://cdn.debian.or.jp sid/main findutils 4.2.30-1 [361kB]
-Get:18 http://cdn.debian.or.jp sid/main login 1:4.0.18.1-8 [804kB]
-Get:19 http://cdn.debian.or.jp sid/main debianutils 2.18.1 [52.4kB]
-Get:20 http://cdn.debian.or.jp sid/main libsepol1 2.0.3-1 [126kB]
-Get:21 http://cdn.debian.or.jp sid/main libselinux1 2.0.15-2 [66.6kB]
-Get:22 http://cdn.debian.or.jp sid/main libdevmapper1.02.1 2:1.02.18-1 [47.4kB]
-Get:23 http://cdn.debian.or.jp sid/main libblkid1 1.39+1.40-WIP-2007.04.07+dfsg-2 [45.2kB]
-Get:24 http://cdn.debian.or.jp sid/main libcomerr2 1.39+1.40-WIP-2007.04.07+dfsg-2 [33.1kB]
-Get:25 http://cdn.debian.or.jp sid/main libslang2 2.0.7-1 [453kB]
-Get:26 http://cdn.debian.or.jp sid/main libss2 1.39+1.40-WIP-2007.04.07+dfsg-2 [39.0kB]
-Get:27 http://cdn.debian.or.jp sid/main libuuid1 1.39+1.40-WIP-2007.04.07+dfsg-2 [34.0kB]
-Get:28 http://cdn.debian.or.jp sid/main tzdata 2007f-2 [378kB]
-Get:29 http://cdn.debian.or.jp sid/main zlib1g 1:1.2.3-14 [73.2kB]
-Get:30 http://cdn.debian.or.jp sid/main info 4.8.dfsg.1-5 [176kB]
-Get:31 http://cdn.debian.or.jp sid/main iputils-ping 3:20070202-1 [45.5kB]
-Get:32 http://cdn.debian.or.jp sid/main liblzo2-2 2.02-2 [54.7kB]
-Get:33 http://cdn.debian.or.jp sid/main libgnutls13 1.6.2-2 [346kB]
-Get:34 http://cdn.debian.or.jp sid/main libsasl2-2 2.1.22.dfsg1-10 [107kB]
-Get:35 http://cdn.debian.or.jp sid/main libssl0.9.8 0.9.8e-5 [909kB]
-Get:36 http://cdn.debian.or.jp sid/main libusb-0.1-4 2:0.1.12-7 [20.4kB]
-Get:37 http://cdn.debian.or.jp sid/main manpages 2.46-1 [496kB]
-Get:38 http://cdn.debian.or.jp sid/main nano 2.0.6-1 [571kB]
-Get:39 http://cdn.debian.or.jp sid/main vim-tiny 1:7.1-000+1 [618kB]
-Get:40 http://cdn.debian.or.jp sid/main vim-common 1:7.1-000+1 [179kB]
-Get:41 http://cdn.debian.or.jp sid/main dselect 1.14.3 [492kB]
-Get:42 http://cdn.debian.or.jp sid/main passwd 1:4.0.18.1-8 [790kB]
-Get:43 http://cdn.debian.or.jp sid/main cpp 4:4.1.2-2 [11.9kB]
-Get:44 http://cdn.debian.or.jp sid/main gcc 4:4.1.2-2 [5056B]
-Get:45 http://cdn.debian.or.jp sid/main g++ 4:4.1.2-2 [1374B]
-
-Extracting templates from packages: 66%
-Extracting templates from packages: 100%
+  libstdc++6-4.1-dev libusb-0.1-4 libuuid1 login man-db manpages mktemp
+  module-init-tools nano ncurses-base ncurses-bin passwd readline-common sed
+  tzdata vim-common vim-tiny zlib1g
+56 upgraded, 3 newly installed, 2 to remove and 0 not upgraded.
+Need to get 30.6MB of archives.
+After unpacking 1552kB of additional disk space will be used.
+Get:1 http://cdn.debian.or.jp sid/main gcc-4.2-base 4.2-20070525-1 [209kB]
+Get:2 http://cdn.debian.or.jp sid/main binutils 2.17cvs20070426-7 [2559kB]
+Get:3 http://cdn.debian.or.jp sid/main libc6-dev 2.5-9 [2472kB]
+Get:4 http://cdn.debian.or.jp sid/main libc6 2.5-9 [4905kB]
+Get:5 http://cdn.debian.or.jp sid/main libgcc1 1:4.2-20070525-1 [26.7kB]
+Get:6 http://cdn.debian.or.jp sid/main libstdc++6 4.2-20070525-1 [312kB]
+Get:7 http://cdn.debian.or.jp sid/main libstdc++6-4.1-dev 4.1.2-8 [1177kB]
+Get:8 http://cdn.debian.or.jp sid/main g++-4.1 4.1.2-8 [2822kB]
+Get:9 http://cdn.debian.or.jp sid/main gcc-4.1 4.1.2-8 [428kB]
+Get:10 http://cdn.debian.or.jp sid/main cpp-4.1 4.1.2-8 [2514kB]
+Get:11 http://cdn.debian.or.jp sid/main gcc-4.1-base 4.1.2-8 [202kB]
+Get:12 http://cdn.debian.or.jp sid/main debianutils 2.19 [52.6kB]
+Get:13 http://cdn.debian.or.jp sid/main diff 2.8.1-12 [192kB]
+Get:14 http://cdn.debian.or.jp sid/main cpio 2.7-3 [115kB]
+Get:15 http://cdn.debian.or.jp sid/main dpkg-dev 1.14.4 [178kB]
+Get:16 http://cdn.debian.or.jp sid/main dpkg 1.14.4 [2080kB]
+Get:17 http://cdn.debian.or.jp sid/main e2fslibs 1.39+1.40-WIP-2007.04.07+dfsg-2 [111kB]
+Get:18 http://cdn.debian.or.jp sid/main e2fsprogs 1.39+1.40-WIP-2007.04.07+dfsg-2 [612kB]
+Get:19 http://cdn.debian.or.jp sid/main findutils 4.2.30-1 [361kB]
+Get:20 http://cdn.debian.or.jp sid/main login 1:4.0.18.1-9 [798kB]
+Get:21 http://cdn.debian.or.jp sid/main mktemp 1.5-3 [11.0kB]
+Get:22 http://cdn.debian.or.jp sid/main ncurses-bin 5.6-3 [235kB]
+Get:23 http://cdn.debian.or.jp sid/main sed 4.1.5-2 [253kB]
+Get:24 http://cdn.debian.or.jp sid/main libncurses5 5.6-3 [336kB]
+Get:25 http://cdn.debian.or.jp sid/main ncurses-base 5.6-3 [12.9kB]
+Get:26 http://cdn.debian.or.jp sid/main libsepol1 2.0.3-1 [126kB]
+Get:27 http://cdn.debian.or.jp sid/main libselinux1 2.0.15-2 [66.6kB]
+Get:28 http://cdn.debian.or.jp sid/main libdevmapper1.02.1 2:1.02.18-1 [47.4kB]
+Get:29 http://cdn.debian.or.jp sid/main libblkid1 1.39+1.40-WIP-2007.04.07+dfsg-2 [45.2kB]
+Get:30 http://cdn.debian.or.jp sid/main libcomerr2 1.39+1.40-WIP-2007.04.07+dfsg-2 [33.1kB]
+Get:31 http://cdn.debian.or.jp sid/main libslang2 2.0.7-1 [453kB]
+Get:32 http://cdn.debian.or.jp sid/main libss2 1.39+1.40-WIP-2007.04.07+dfsg-2 [39.0kB]
+Get:33 http://cdn.debian.or.jp sid/main libuuid1 1.39+1.40-WIP-2007.04.07+dfsg-2 [34.0kB]
+Get:34 http://cdn.debian.or.jp sid/main tzdata 2007f-4 [385kB]
+Get:35 http://cdn.debian.or.jp sid/main zlib1g 1:1.2.3-15 [73.5kB]
+Get:36 http://cdn.debian.or.jp sid/main dmidecode 2.9-1 [58.8kB]
+Get:37 http://cdn.debian.or.jp sid/main info 4.8.dfsg.1-6 [177kB]
+Get:38 http://cdn.debian.or.jp sid/main iputils-ping 3:20070202-1 [45.5kB]
+Get:39 http://cdn.debian.or.jp sid/main laptop-detect 0.13.1 [4574B]
+Get:40 http://cdn.debian.or.jp sid/main libbz2-1.0 1.0.3-7 [41.6kB]
+Get:41 http://cdn.debian.or.jp sid/main liblzo2-2 2.02-2 [54.7kB]
+Get:42 http://cdn.debian.or.jp sid/main libgnutls13 1.6.2-2 [346kB]
+Get:43 http://cdn.debian.or.jp sid/main libncursesw5 5.6-3 [358kB]
+Get:44 http://cdn.debian.or.jp sid/main readline-common 5.2-3 [50.8kB]
+Get:45 http://cdn.debian.or.jp sid/main libreadline5 5.2-3 [144kB]
+Get:46 http://cdn.debian.or.jp sid/main libsasl2-2 2.1.22.dfsg1-10 [107kB]
+Get:47 http://cdn.debian.or.jp sid/main libssl0.9.8 0.9.8e-5 [909kB]
+Get:48 http://cdn.debian.or.jp sid/main libusb-0.1-4 2:0.1.12-7 [20.4kB]
+Get:49 http://cdn.debian.or.jp sid/main man-db 2.4.4-3 [765kB]
+Get:50 http://cdn.debian.or.jp sid/main manpages 2.49-1 [495kB]
+Get:51 http://cdn.debian.or.jp sid/main module-init-tools 3.3-pre11-1 [85.3kB]
+Get:52 http://cdn.debian.or.jp sid/main nano 2.0.6-1 [571kB]
+Get:53 http://cdn.debian.or.jp sid/main vim-tiny 1:7.1-000+1 [618kB]
+Get:54 http://cdn.debian.or.jp sid/main vim-common 1:7.1-000+1 [179kB]
+Get:55 http://cdn.debian.or.jp sid/main dselect 1.14.4 [500kB]
+Get:56 http://cdn.debian.or.jp sid/main passwd 1:4.0.18.1-9 [788kB]
+Get:57 http://cdn.debian.or.jp sid/main cpp 4:4.1.2-2 [11.9kB]
+Get:58 http://cdn.debian.or.jp sid/main gcc 4:4.1.2-2 [5056B]
+Get:59 http://cdn.debian.or.jp sid/main g++ 4:4.1.2-2 [1374B]
+
+Extracting templates from packages: 50%
+Extracting templates from packages: 100%
 Preconfiguring packages ...
-Fetched 27.8MB in 3s (7543kB/s)
+Fetched 30.6MB in 14s (2096kB/s)
 (Reading database ... 12030 files and directories currently installed.)
 Removing libsasl2 ...
+Selecting previously deselected package gcc-4.2-base.
 (Reading database ... 12026 files and directories currently installed.)
-Preparing to replace libc6-dev 2.3.6.ds1-13 (using .../libc6-dev_2.5-7_amd64.deb) ...
+Unpacking gcc-4.2-base (from .../gcc-4.2-base_4.2-20070525-1_amd64.deb) ...
+Preparing to replace binutils 2.17-3 (using .../binutils_2.17cvs20070426-7_amd64.deb) ...
+Unpacking replacement binutils ...
+Preparing to replace libc6-dev 2.3.6.ds1-13 (using .../libc6-dev_2.5-9_amd64.deb) ...
 Unpacking replacement libc6-dev ...
-Preparing to replace libc6 2.3.6.ds1-13 (using .../archives/libc6_2.5-7_amd64.deb) ...
+Preparing to replace libc6 2.3.6.ds1-13 (using .../archives/libc6_2.5-9_amd64.deb) ...
 Unpacking replacement libc6 ...
-Setting up libc6 (2.5-7) ...
+Setting up libc6 (2.5-9) ...
 Installing new version of config file /etc/init.d/glibc.sh ...
 
-(Reading database ... 12091 files and directories currently installed.)
-Preparing to replace gcc-4.1-base 4.1.1-21 (using .../gcc-4.1-base_4.1.2-7_amd64.deb) ...
-Unpacking replacement gcc-4.1-base ...
-Preparing to replace libgcc1 1:4.1.1-21 (using .../libgcc1_1%3a4.1.2-7_amd64.deb) ...
+(Reading database ... 12100 files and directories currently installed.)
+Preparing to replace libgcc1 1:4.1.1-21 (using .../libgcc1_1%3a4.2-20070525-1_amd64.deb) ...
 Unpacking replacement libgcc1 ...
-Setting up gcc-4.1-base (4.1.2-7) ...
+Setting up gcc-4.2-base (4.2-20070525-1) ...
 
-Setting up libgcc1 (4.1.2-7) ...
+Setting up libgcc1 (4.2-20070525-1) ...
 
-(Reading database ... 12091 files and directories currently installed.)
-Preparing to replace libstdc++6 4.1.1-21 (using .../libstdc++6_4.1.2-7_amd64.deb) ...
+(Reading database ... 12100 files and directories currently installed.)
+Preparing to replace libstdc++6 4.1.1-21 (using .../libstdc++6_4.2-20070525-1_amd64.deb) ...
 Unpacking replacement libstdc++6 ...
-Setting up libstdc++6 (4.1.2-7) ...
+Setting up libstdc++6 (4.2-20070525-1) ...
 
-(Reading database ... 12091 files and directories currently installed.)
-Preparing to replace cpp-4.1 4.1.1-21 (using .../cpp-4.1_4.1.2-7_amd64.deb) ...
-Unpacking replacement cpp-4.1 ...
-Preparing to replace binutils 2.17-3 (using .../binutils_2.17cvs20070426-6_amd64.deb) ...
-Unpacking replacement binutils ...
-Preparing to replace gcc-4.1 4.1.1-21 (using .../gcc-4.1_4.1.2-7_amd64.deb) ...
-Unpacking replacement gcc-4.1 ...
-Preparing to replace g++-4.1 4.1.1-21 (using .../g++-4.1_4.1.2-7_amd64.deb) ...
-Unpacking replacement g++-4.1 ...
-Preparing to replace libstdc++6-4.1-dev 4.1.1-21 (using .../libstdc++6-4.1-dev_4.1.2-7_amd64.deb) ...
+(Reading database ... 12100 files and directories currently installed.)
+Preparing to replace libstdc++6-4.1-dev 4.1.1-21 (using .../libstdc++6-4.1-dev_4.1.2-8_amd64.deb) ...
 Unpacking replacement libstdc++6-4.1-dev ...
-(Reading database ... 12096 files and directories currently installed.)
+Preparing to replace g++-4.1 4.1.1-21 (using .../g++-4.1_4.1.2-8_amd64.deb) ...
+Unpacking replacement g++-4.1 ...
+Preparing to replace gcc-4.1 4.1.1-21 (using .../gcc-4.1_4.1.2-8_amd64.deb) ...
+Unpacking replacement gcc-4.1 ...
+Preparing to replace cpp-4.1 4.1.1-21 (using .../cpp-4.1_4.1.2-8_amd64.deb) ...
+Unpacking replacement cpp-4.1 ...
+(Reading database ... 12100 files and directories currently installed.)
 Removing libssp0 ...
-(Reading database ... 12093 files and directories currently installed.)
+(Reading database ... 12097 files and directories currently installed.)
+Preparing to replace gcc-4.1-base 4.1.1-21 (using .../gcc-4.1-base_4.1.2-8_amd64.deb) ...
+Unpacking replacement gcc-4.1-base ...
+Preparing to replace debianutils 2.18 (using .../debianutils_2.19_amd64.deb) ...
+Unpacking replacement debianutils ...
+Setting up debianutils (2.19) ...
+
+(Reading database ... 12097 files and directories currently installed.)
 Preparing to replace diff 2.8.1-11 (using .../diff_2.8.1-12_amd64.deb) ...
 Unpacking replacement diff ...
 Setting up diff (2.8.1-12) ...
-(Reading database ... 12093 files and directories currently installed.)
-Preparing to replace cpio 2.7-1 (using .../archives/cpio_2.7-2_amd64.deb) ...
+(Reading database ... 12097 files and directories currently installed.)
+Preparing to replace cpio 2.7-1 (using .../archives/cpio_2.7-3_amd64.deb) ...
 Unpacking replacement cpio ...
-Preparing to replace dpkg-dev 1.13.25 (using .../dpkg-dev_1.14.3_all.deb) ...
+Preparing to replace dpkg-dev 1.13.25 (using .../dpkg-dev_1.14.4_all.deb) ...
 Unpacking replacement dpkg-dev ...
-Preparing to replace dpkg 1.13.25 (using .../archives/dpkg_1.14.3_amd64.deb) ...
+Preparing to replace dpkg 1.13.25 (using .../archives/dpkg_1.14.4_amd64.deb) ...
 Unpacking replacement dpkg ...
-Setting up dpkg (1.14.3) ...
+Setting up dpkg (1.14.4) ...
 
-(Reading database ... 12073 files and directories currently installed.)
+(Reading database ... 12096 files and directories currently installed.)
 Preparing to replace e2fslibs 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../e2fslibs_1.39+1.40-WIP-2007.04.07+dfsg-2_amd64.deb) ...
 Unpacking replacement e2fslibs ...
 Setting up e2fslibs (1.39+1.40-WIP-2007.04.07+dfsg-2) ...
 
-(Reading database ... 12073 files and directories currently installed.)
+(Reading database ... 12096 files and directories currently installed.)
 Preparing to replace e2fsprogs 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../e2fsprogs_1.39+1.40-WIP-2007.04.07+dfsg-2_amd64.deb) ...
 Unpacking replacement e2fsprogs ...
 Setting up e2fsprogs (1.39+1.40-WIP-2007.04.07+dfsg-2) ...
-(Reading database ... 12073 files and directories currently installed.)
+(Reading database ... 12096 files and directories currently installed.)
 Preparing to replace findutils 4.2.28-2 (using .../findutils_4.2.30-1_amd64.deb) ...
 Unpacking replacement findutils ...
 Setting up findutils (4.2.30-1) ...
 
-(Reading database ... 12073 files and directories currently installed.)
-Preparing to replace login 1:4.0.18.1-7 (using .../login_1%3a4.0.18.1-8_amd64.deb) ...
+(Reading database ... 12096 files and directories currently installed.)
+Preparing to replace login 1:4.0.18.1-7 (using .../login_1%3a4.0.18.1-9_amd64.deb) ...
 Unpacking replacement login ...
-Setting up login (1:4.0.18.1-8) ...
+Setting up login (1:4.0.18.1-9) ...
 Installing new version of config file /etc/login.defs ...
 
-(Reading database ... 12073 files and directories currently installed.)
-Preparing to replace debianutils 2.18 (using .../debianutils_2.18.1_amd64.deb) ...
-Unpacking replacement debianutils ...
-Setting up debianutils (2.18.1) ...
-
-(Reading database ... 12073 files and directories currently installed.)
+(Reading database ... 12096 files and directories currently installed.)
+Preparing to replace mktemp 1.5-2 (using .../mktemp_1.5-3_amd64.deb) ...
+Unpacking replacement mktemp ...
+Setting up mktemp (1.5-3) ...
+(Reading database ... 12096 files and directories currently installed.)
+Preparing to replace ncurses-bin 5.5-5 (using .../ncurses-bin_5.6-3_amd64.deb) ...
+Unpacking replacement ncurses-bin ...
+Setting up ncurses-bin (5.6-3) ...
+(Reading database ... 12097 files and directories currently installed.)
+Preparing to replace sed 4.1.5-1 (using .../archives/sed_4.1.5-2_amd64.deb) ...
+Unpacking replacement sed ...
+Setting up sed (4.1.5-2) ...
+
+(Reading database ... 12097 files and directories currently installed.)
+Preparing to replace libncurses5 5.5-5 (using .../libncurses5_5.6-3_amd64.deb) ...
+Unpacking replacement libncurses5 ...
+Setting up libncurses5 (5.6-3) ...
+
+(Reading database ... 12097 files and directories currently installed.)
+Preparing to replace ncurses-base 5.5-5 (using .../ncurses-base_5.6-3_all.deb) ...
+Unpacking replacement ncurses-base ...
+Setting up ncurses-base (5.6-3) ...
+(Reading database ... 12097 files and directories currently installed.)
 Preparing to replace libsepol1 1.14-3 (using .../libsepol1_2.0.3-1_amd64.deb) ...
 Unpacking replacement libsepol1 ...
 Setting up libsepol1 (2.0.3-1) ...
 telinit: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 12073 files and directories currently installed.)
+(Reading database ... 12097 files and directories currently installed.)
 Preparing to replace libselinux1 1.32-3 (using .../libselinux1_2.0.15-2_amd64.deb) ...
 Unpacking replacement libselinux1 ...
 Setting up libselinux1 (2.0.15-2) ...
 init: timeout opening/writing control channel /dev/initctl
 
 Selecting previously deselected package libdevmapper1.02.1.
-(Reading database ... 12073 files and directories currently installed.)
+(Reading database ... 12097 files and directories currently installed.)
 Unpacking libdevmapper1.02.1 (from .../libdevmapper1.02.1_2%3a1.02.18-1_amd64.deb) ...
 Preparing to replace libblkid1 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../libblkid1_1.39+1.40-WIP-2007.04.07+dfsg-2_amd64.deb) ...
 Unpacking replacement libblkid1 ...
@@ -175,68 +215,84 @@ Setting up libdevmapper1.02.1 (2:1.02.18-1) ...
 
 Setting up libblkid1 (1.39+1.40-WIP-2007.04.07+dfsg-2) ...
 
-(Reading database ... 12079 files and directories currently installed.)
+(Reading database ... 12103 files and directories currently installed.)
 Preparing to replace libcomerr2 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../libcomerr2_1.39+1.40-WIP-2007.04.07+dfsg-2_amd64.deb) ...
 Unpacking replacement libcomerr2 ...
 Setting up libcomerr2 (1.39+1.40-WIP-2007.04.07+dfsg-2) ...
 
-(Reading database ... 12079 files and directories currently installed.)
+(Reading database ... 12103 files and directories currently installed.)
 Preparing to replace libslang2 2.0.6-4 (using .../libslang2_2.0.7-1_amd64.deb) ...
 Unpacking replacement libslang2 ...
 Setting up libslang2 (2.0.7-1) ...
 
-(Reading database ... 12079 files and directories currently installed.)
+(Reading database ... 12103 files and directories currently installed.)
 Preparing to replace libss2 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../libss2_1.39+1.40-WIP-2007.04.07+dfsg-2_amd64.deb) ...
 Unpacking replacement libss2 ...
 Setting up libss2 (1.39+1.40-WIP-2007.04.07+dfsg-2) ...
 
-(Reading database ... 12079 files and directories currently installed.)
+(Reading database ... 12103 files and directories currently installed.)
 Preparing to replace libuuid1 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../libuuid1_1.39+1.40-WIP-2007.04.07+dfsg-2_amd64.deb) ...
 Unpacking replacement libuuid1 ...
 Setting up libuuid1 (1.39+1.40-WIP-2007.04.07+dfsg-2) ...
 
-(Reading database ... 12079 files and directories currently installed.)
-Preparing to replace tzdata 2007f-1 (using .../tzdata_2007f-2_all.deb) ...
+(Reading database ... 12103 files and directories currently installed.)
+Preparing to replace tzdata 2007f-3 (using .../tzdata_2007f-4_all.deb) ...
 Unpacking replacement tzdata ...
-Setting up tzdata (2007f-2) ...
+Setting up tzdata (2007f-4) ...
 
 User defined timezone, leaving /etc/localtime unchanged.
-Local time is now:      Thu May 17 03:12:07 UTC 2007.
-Universal Time is now:  Thu May 17 03:12:07 UTC 2007.
+Local time is now:      Sun May 27 02:14:47 UTC 2007.
+Universal Time is now:  Sun May 27 02:14:47 UTC 2007.
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
 
-(Reading database ... 12079 files and directories currently installed.)
-Preparing to replace zlib1g 1:1.2.3-13 (using .../zlib1g_1%3a1.2.3-14_amd64.deb) ...
+(Reading database ... 12103 files and directories currently installed.)
+Preparing to replace zlib1g 1:1.2.3-13 (using .../zlib1g_1%3a1.2.3-15_amd64.deb) ...
 Unpacking replacement zlib1g ...
-Setting up zlib1g (1:1.2.3-14) ...
+Setting up zlib1g (1:1.2.3-15) ...
 
-(Reading database ... 12079 files and directories currently installed.)
-Preparing to replace info 4.8.dfsg.1-4 (using .../info_4.8.dfsg.1-5_amd64.deb) ...
+(Reading database ... 12103 files and directories currently installed.)
+Preparing to replace dmidecode 2.8-4 (using .../dmidecode_2.9-1_amd64.deb) ...
+Unpacking replacement dmidecode ...
+Preparing to replace info 4.8.dfsg.1-4 (using .../info_4.8.dfsg.1-6_amd64.deb) ...
 Unpacking replacement info ...
 Preparing to replace iputils-ping 3:20020927-6 (using .../iputils-ping_3%3a20070202-1_amd64.deb) ...
 Unpacking replacement iputils-ping ...
+Preparing to replace laptop-detect 0.12.1-0.1 (using .../laptop-detect_0.13.1_amd64.deb) ...
+Unpacking replacement laptop-detect ...
+Preparing to replace libbz2-1.0 1.0.3-6 (using .../libbz2-1.0_1.0.3-7_amd64.deb) ...
+Unpacking replacement libbz2-1.0 ...
 Selecting previously deselected package liblzo2-2.
 Unpacking liblzo2-2 (from .../liblzo2-2_2.02-2_amd64.deb) ...
 Preparing to replace libgnutls13 1.4.4-3 (using .../libgnutls13_1.6.2-2_amd64.deb) ...
 Unpacking replacement libgnutls13 ...
+Preparing to replace libncursesw5 5.5-5 (using .../libncursesw5_5.6-3_amd64.deb) ...
+Unpacking replacement libncursesw5 ...
+Preparing to replace readline-common 5.2-2 (using .../readline-common_5.2-3_all.deb) ...
+Unpacking replacement readline-common ...
+Preparing to replace libreadline5 5.2-2 (using .../libreadline5_5.2-3_amd64.deb) ...
+Unpacking replacement libreadline5 ...
 Preparing to replace libsasl2-2 2.1.22.dfsg1-8 (using .../libsasl2-2_2.1.22.dfsg1-10_amd64.deb) ...
 Unpacking replacement libsasl2-2 ...
 Preparing to replace libssl0.9.8 0.9.8e-4 (using .../libssl0.9.8_0.9.8e-5_amd64.deb) ...
 Unpacking replacement libssl0.9.8 ...
 Preparing to replace libusb-0.1-4 2:0.1.12-6 (using .../libusb-0.1-4_2%3a0.1.12-7_amd64.deb) ...
 Unpacking replacement libusb-0.1-4 ...
-Preparing to replace manpages 2.43-0 (using .../manpages_2.46-1_all.deb) ...
+Preparing to replace man-db 2.4.4-2 (using .../man-db_2.4.4-3_amd64.deb) ...
+Unpacking replacement man-db ...
+Preparing to replace manpages 2.43-0 (using .../manpages_2.49-1_all.deb) ...
 Unpacking replacement manpages ...
+Preparing to replace module-init-tools 3.3-pre4-2 (using .../module-init-tools_3.3-pre11-1_amd64.deb) ...
+Unpacking replacement module-init-tools ...
 Preparing to replace nano 2.0.3-1 (using .../nano_2.0.6-1_amd64.deb) ...
 Unpacking replacement nano ...
 Preparing to replace vim-tiny 1:7.0-219+1 (using .../vim-tiny_1%3a7.1-000+1_amd64.deb) ...
 Unpacking replacement vim-tiny ...
 Preparing to replace vim-common 1:7.0-219+1 (using .../vim-common_1%3a7.1-000+1_amd64.deb) ...
 Unpacking replacement vim-common ...
-Preparing to replace dselect 1.13.25 (using .../dselect_1.14.3_amd64.deb) ...
+Preparing to replace dselect 1.13.25 (using .../dselect_1.14.4_amd64.deb) ...
 Unpacking replacement dselect ...
-Preparing to replace passwd 1:4.0.18.1-7 (using .../passwd_1%3a4.0.18.1-8_amd64.deb) ...
+Preparing to replace passwd 1:4.0.18.1-7 (using .../passwd_1%3a4.0.18.1-9_amd64.deb) ...
 Unpacking replacement passwd ...
 Preparing to replace cpp 4:4.1.1-15 (using .../cpp_4%3a4.1.2-2_amd64.deb) ...
 Unpacking replacement cpp ...
@@ -245,44 +301,60 @@ Removing old gcc doc directory.
 Unpacking replacement gcc ...
 Preparing to replace g++ 4:4.1.1-15 (using .../g++_4%3a4.1.2-2_amd64.deb) ...
 Unpacking replacement g++ ...
-Setting up libc6-dev (2.5-7) ...
-Setting up cpp-4.1 (4.1.2-7) ...
-Setting up binutils (2.17cvs20070426-6) ...
+Setting up binutils (2.17cvs20070426-7) ...
 
-Setting up gcc-4.1 (4.1.2-7) ...
-Setting up cpio (2.7-2) ...
+Setting up libc6-dev (2.5-9) ...
+Setting up gcc-4.1-base (4.1.2-8) ...
 
-Setting up dpkg-dev (1.14.3) ...
-Setting up info (4.8.dfsg.1-5) ...
+Setting up cpp-4.1 (4.1.2-8) ...
+Setting up gcc-4.1 (4.1.2-8) ...
+Setting up cpio (2.7-3) ...
+
+Setting up dpkg-dev (1.14.4) ...
+Setting up dmidecode (2.9-1) ...
+Setting up info (4.8.dfsg.1-6) ...
 
 Setting up iputils-ping (3:20070202-1) ...
+Setting up laptop-detect (0.13.1) ...
+Setting up libbz2-1.0 (1.0.3-7) ...
+
 Setting up liblzo2-2 (2.02-2) ...
 
 Setting up libgnutls13 (1.6.2-2) ...
 
+Setting up libncursesw5 (5.6-3) ...
+
+Setting up readline-common (5.2-3) ...
+
+Setting up libreadline5 (5.2-3) ...
+
 Setting up libsasl2-2 (2.1.22.dfsg1-10) ...
 
 Setting up libssl0.9.8 (0.9.8e-5) ...
 
 Setting up libusb-0.1-4 (2:0.1.12-7) ...
 
-Setting up manpages (2.46-1) ...
+Setting up man-db (2.4.4-3) ...
+
+Setting up manpages (2.49-1) ...
+Setting up module-init-tools (3.3-pre11-1) ...
+
 Setting up nano (2.0.6-1) ...
 
 Setting up vim-common (1:7.1-000+1) ...
 
 Setting up vim-tiny (1:7.1-000+1) ...
 
-Setting up dselect (1.14.3) ...
-Setting up passwd (1:4.0.18.1-8) ...
+Setting up dselect (1.14.4) ...
+Setting up passwd (1:4.0.18.1-9) ...
 Installing new version of config file /etc/default/useradd ...
 
 Setting up cpp (4:4.1.2-2) ...
 
 Setting up gcc (4:4.1.2-2) ...
 
-Setting up libstdc++6-4.1-dev (4.1.2-7) ...
-Setting up g++-4.1 (4.1.2-7) ...
+Setting up libstdc++6-4.1-dev (4.1.2-8) ...
+Setting up g++-4.1 (4.1.2-8) ...
 Setting up g++ (4:4.1.2-2) ...
 
 Reading package lists...
@@ -298,9 +370,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//23916/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//10089/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> creating base tarball [/TESTDIR/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//23916 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//10089 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-etch.log b/testsuite/normal/pdebuild-internal-etch.log
index 14950c4..c64cffb 100644
--- a/testsuite/normal/pdebuild-internal-etch.log
+++ b/testsuite/normal/pdebuild-internal-etch.log
@@ -1,11 +1,11 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2
+-> Mounting /TESTDIR/dir2
  -> policy-rc.d already exists
 Reading package lists...
 Building dependency tree...
@@ -25,7 +25,7 @@ Get:1 http://cdn.debian.or.jp etch/main libdebian-installer4 0.50 [27.3kB]
 Get:2 http://cdn.debian.or.jp etch/main libdebian-installer-extra4 0.50 [10.5kB]
 Get:3 http://cdn.debian.or.jp etch/main cdebootstrap 0.3.15 [26.7kB]
 Get:4 http://cdn.debian.or.jp etch/main pbuilder 0.161 [82.6kB]
-Fetched 147kB in 0s (314kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package libdebian-installer4.
 (Reading database ... 12033 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.50_amd64.deb) ...
@@ -73,7 +73,7 @@ Get:7 http://cdn.debian.or.jp etch/main po-debconf 1.0.8 [111kB]
 Get:8 http://cdn.debian.or.jp etch/main debhelper 5.0.42 [510kB]
 Get:9 http://cdn.debian.or.jp etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3482kB in 1s (2329kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12127 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-5etch1_amd64.deb) ...
@@ -119,7 +119,7 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp etch/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (531kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12797 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
@@ -135,14 +135,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -337,18 +337,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 Making all in m4
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -361,26 +361,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 Making check in m4
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -418,8 +418,8 @@ success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
-c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+c: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -431,7 +431,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Thu May 17 03:10:19 UTC 2007
+Sun May 27 02:11:14 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -501,14 +501,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Thu May 17 03:10:24 UTC 2007
+Sun May 27 02:11:19 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
 b: b
 c: c
 dsh: Process terminated (before write).
-a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -517,9 +517,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -527,58 +527,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+/usr/bin/make install DESTDIR=/TESTDIR/dir2/dsh-0.25.7/debian/dsh
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 Making install in m4
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
 	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
 	    /usr/bin/install -c -m 644 ./$file \
-			    /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
+			    /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-test -z "/usr/bin" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
+test -z "/usr/bin" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/dsh.conf /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+cp /TESTDIR/dir2/dsh-0.25.7/debian/machines.list /TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
+cp /TESTDIR/dir2/dsh-0.25.7/dsh.conf /TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
+install -d /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
+install -m 755 /TESTDIR/dir2/dsh-0.25.7/debian/dsh.updatelist /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -599,8 +599,8 @@ dpkg-deb: building package `dsh' in `../dsh_0.25.7-1_amd64.deb'.
  dpkg-genchanges
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
- -> unmounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2 filesystem
+ -> unmounting /TESTDIR/dir2 filesystem
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir3/17272 and its subdirectories
+    -> removing directory /TESTDIR/dir3/2276 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-lenny.log b/testsuite/normal/pdebuild-internal-lenny.log
index 419ada7..65378e1 100644
--- a/testsuite/normal/pdebuild-internal-lenny.log
+++ b/testsuite/normal/pdebuild-internal-lenny.log
@@ -1,11 +1,11 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2
+-> Mounting /TESTDIR/dir2
  -> policy-rc.d already exists
 Reading package lists...
 Building dependency tree...
@@ -25,7 +25,7 @@ Get:1 http://cdn.debian.or.jp lenny/main libdebian-installer4 0.50 [27.3kB]
 Get:2 http://cdn.debian.or.jp lenny/main libdebian-installer-extra4 0.50 [10.5kB]
 Get:3 http://cdn.debian.or.jp lenny/main cdebootstrap 0.3.15 [26.7kB]
 Get:4 http://cdn.debian.or.jp lenny/main pbuilder 0.161 [82.6kB]
-Fetched 147kB in 0s (536kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package libdebian-installer4.
 (Reading database ... 12030 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.50_amd64.deb) ...
@@ -73,7 +73,7 @@ Get:7 http://cdn.debian.or.jp lenny/main po-debconf 1.0.8 [111kB]
 Get:8 http://cdn.debian.or.jp lenny/main debhelper 5.0.49 [517kB]
 Get:9 http://cdn.debian.or.jp lenny/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp lenny/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3545kB in 1s (2534kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12124 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.20-4_amd64.deb) ...
@@ -119,7 +119,7 @@ The following NEW packages will be installed:
 Need to get 103kB of archives.
 After unpacking 430kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp lenny/main fakeroot 1.6.5 [103kB]
-Fetched 103kB in 0s (1538kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12799 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.6.5_amd64.deb) ...
@@ -135,14 +135,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -337,18 +337,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 Making all in m4
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -361,26 +361,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 Making check in m4
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -417,9 +417,9 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
-b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+b: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -431,7 +431,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Thu May 17 03:17:28 UTC 2007
+Sun May 27 02:24:20 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -501,12 +501,13 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Thu May 17 03:17:33 UTC 2007
+Sun May 27 02:24:25 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
 b: b
+dsh: Process terminated (before write).
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -516,9 +517,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -526,58 +527,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+/usr/bin/make install DESTDIR=/TESTDIR/dir2/dsh-0.25.7/debian/dsh
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 Making install in m4
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
 	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
 	    /usr/bin/install -c -m 644 ./$file \
-			    /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
+			    /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-test -z "/usr/bin" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
+test -z "/usr/bin" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/dsh.conf /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+cp /TESTDIR/dir2/dsh-0.25.7/debian/machines.list /TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
+cp /TESTDIR/dir2/dsh-0.25.7/dsh.conf /TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
+install -d /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
+install -m 755 /TESTDIR/dir2/dsh-0.25.7/debian/dsh.updatelist /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -598,8 +599,8 @@ dpkg-deb: building package `dsh' in `../dsh_0.25.7-1_amd64.deb'.
  dpkg-genchanges
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
- -> unmounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2 filesystem
+ -> unmounting /TESTDIR/dir2 filesystem
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir3/16848 and its subdirectories
+    -> removing directory /TESTDIR/dir3/18613 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-sid.log b/testsuite/normal/pdebuild-internal-sid.log
index 390b7c2..ce0d341 100644
--- a/testsuite/normal/pdebuild-internal-sid.log
+++ b/testsuite/normal/pdebuild-internal-sid.log
@@ -1,11 +1,11 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2
+-> Mounting /TESTDIR/dir2
  -> policy-rc.d already exists
 Reading package lists...
 Building dependency tree...
@@ -25,9 +25,9 @@ Get:1 http://cdn.debian.or.jp sid/main libdebian-installer4 0.51 [28.1kB]
 Get:2 http://cdn.debian.or.jp sid/main libdebian-installer-extra4 0.51 [10.6kB]
 Get:3 http://cdn.debian.or.jp sid/main cdebootstrap 0.4.3 [29.0kB]
 Get:4 http://cdn.debian.or.jp sid/main pbuilder 0.166 [85.8kB]
-Fetched 153kB in 0s (1094kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 11040 files and directories currently installed.)
+(Reading database ... 11070 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.51_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.51_amd64.deb) ...
@@ -61,10 +61,10 @@ The following NEW packages will be installed:
   debhelper file gettext gettext-base html2text intltool-debian libdshconfig1
   libdshconfig1-dev libmagic1 po-debconf
 0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
-Need to get 3546kB of archives.
+Need to get 3549kB of archives.
 After unpacking 12.0MB of additional disk space will be used.
-Get:1 http://cdn.debian.or.jp sid/main libmagic1 4.20-5 [327kB]
-Get:2 http://cdn.debian.or.jp sid/main file 4.20-5 [39.2kB]
+Get:1 http://cdn.debian.or.jp sid/main libmagic1 4.20-8 [329kB]
+Get:2 http://cdn.debian.or.jp sid/main file 4.20-8 [39.6kB]
 Get:3 http://cdn.debian.or.jp sid/main gettext-base 0.16.1-1 [132kB]
 Get:4 http://cdn.debian.or.jp sid/main html2text 1.3.2a-3 [92.7kB]
 Get:5 http://cdn.debian.or.jp sid/main gettext 0.16.1-1 [2261kB]
@@ -73,12 +73,12 @@ Get:7 http://cdn.debian.or.jp sid/main po-debconf 1.0.8 [111kB]
 Get:8 http://cdn.debian.or.jp sid/main debhelper 5.0.49 [517kB]
 Get:9 http://cdn.debian.or.jp sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3546kB in 1s (2725kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11139 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.20-5_amd64.deb) ...
+(Reading database ... 11169 files and directories currently installed.)
+Unpacking libmagic1 (from .../libmagic1_4.20-8_amd64.deb) ...
 Selecting previously deselected package file.
-Unpacking file (from .../archives/file_4.20-5_amd64.deb) ...
+Unpacking file (from .../archives/file_4.20-8_amd64.deb) ...
 Selecting previously deselected package gettext-base.
 Unpacking gettext-base (from .../gettext-base_0.16.1-1_amd64.deb) ...
 Selecting previously deselected package html2text.
@@ -95,9 +95,9 @@ Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.12-2_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
 Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.12-2_amd64.deb) ...
-Setting up libmagic1 (4.20-5) ...
+Setting up libmagic1 (4.20-8) ...
 
-Setting up file (4.20-5) ...
+Setting up file (4.20-8) ...
 Setting up gettext-base (0.16.1-1) ...
 
 Setting up html2text (1.3.2a-3) ...
@@ -119,9 +119,9 @@ The following NEW packages will be installed:
 Need to get 111kB of archives.
 After unpacking 451kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main fakeroot 1.7.1 [111kB]
-Fetched 111kB in 0s (1116kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11814 files and directories currently installed.)
+(Reading database ... 11844 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.7.1_amd64.deb) ...
 Setting up fakeroot (1.7.1) ...
 
@@ -135,14 +135,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -337,18 +337,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 Making all in m4
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -361,26 +361,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 Making check in m4
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -416,10 +416,10 @@ success
 success
 success
 success
-a: dsh: Failed executing ./invalid-exec-file with llexec call
-c: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+a: dsh: Failed executing ./invalid-exec-file with llexec call
+c: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -431,7 +431,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Thu May 17 03:05:29 UTC 2007
+Sun May 27 02:05:14 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -501,13 +501,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Thu May 17 03:05:34 UTC 2007
+Sun May 27 02:05:19 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-c: c
 b: b
+c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -516,9 +517,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -526,58 +527,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+/usr/bin/make install DESTDIR=/TESTDIR/dir2/dsh-0.25.7/debian/dsh
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 Making install in m4
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
 	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
 	    /usr/bin/install -c -m 644 ./$file \
-			    /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
+			    /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-test -z "/usr/bin" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
+make[3]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
+test -z "/usr/bin" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
-cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/dsh.conf /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- "/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
+cp /TESTDIR/dir2/dsh-0.25.7/debian/machines.list /TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
+cp /TESTDIR/dir2/dsh-0.25.7/dsh.conf /TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /TESTDIR/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
+install -d /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
+install -m 755 /TESTDIR/dir2/dsh-0.25.7/debian/dsh.updatelist /TESTDIR/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -598,8 +599,8 @@ dpkg-deb: building package `dsh' in `../dsh_0.25.7-1_amd64.deb'.
  dpkg-genchanges
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
- -> unmounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2 filesystem
+ -> unmounting /TESTDIR/dir2 filesystem
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir3/19734 and its subdirectories
+    -> removing directory /TESTDIR/dir3/4739 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-etch.log b/testsuite/normal/pdebuild-normal-etch.log
index 0b773b3..d2129e9 100644
--- a/testsuite/normal/pdebuild-normal-etch.log
+++ b/testsuite/normal/pdebuild-normal-etch.log
@@ -7,14 +7,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -28,10 +28,10 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: source only upload (original source is included)
 W: /home/dancer/.pbuilderrc does not exist
 I: using fakeroot in build.
-Current time: Thu May 17 12:08:49 JST 2007
-pbuilder-time-stamp: 1179371329
+Current time: TIME
+pbuilder-time-stamp: XXXX
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -70,7 +70,7 @@ Get:7 http://cdn.debian.or.jp etch/main po-debconf 1.0.8 [111kB]
 Get:8 http://cdn.debian.or.jp etch/main debhelper 5.0.42 [510kB]
 Get:9 http://cdn.debian.or.jp etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3482kB in 0s (5869kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12033 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-5etch1_amd64.deb) ...
@@ -116,7 +116,7 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp etch/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (327kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12703 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
@@ -440,9 +440,9 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
+d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -454,7 +454,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Thu May 17 03:09:28 UTC 2007
+Sun May 27 02:10:10 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -524,14 +524,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Thu May 17 03:09:33 UTC 2007
+Sun May 27 02:10:15 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-b: b
-c: c
 dsh: Process terminated (before write).
+c: c
+b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -636,7 +636,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Thu May 17 12:09:35 JST 2007
-pbuilder-time-stamp: 1179371375
+Current time: TIME
+pbuilder-time-stamp: XXXX
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir3/11481 and its subdirectories
+    -> removing directory /TESTDIR/dir3/28883 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-lenny.log b/testsuite/normal/pdebuild-normal-lenny.log
index 7141c58..329e714 100644
--- a/testsuite/normal/pdebuild-normal-lenny.log
+++ b/testsuite/normal/pdebuild-normal-lenny.log
@@ -7,14 +7,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -28,10 +28,10 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: source only upload (original source is included)
 W: /home/dancer/.pbuilderrc does not exist
 I: using fakeroot in build.
-Current time: Thu May 17 12:15:58 JST 2007
-pbuilder-time-stamp: 1179371758
+Current time: TIME
+pbuilder-time-stamp: XXXX
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -70,7 +70,7 @@ Get:7 http://cdn.debian.or.jp lenny/main po-debconf 1.0.8 [111kB]
 Get:8 http://cdn.debian.or.jp lenny/main debhelper 5.0.49 [517kB]
 Get:9 http://cdn.debian.or.jp lenny/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp lenny/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3545kB in 1s (2411kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12030 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.20-4_amd64.deb) ...
@@ -116,7 +116,7 @@ The following NEW packages will be installed:
 Need to get 103kB of archives.
 After unpacking 430kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp lenny/main fakeroot 1.6.5 [103kB]
-Fetched 103kB in 0s (912kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12705 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.6.5_amd64.deb) ...
@@ -454,7 +454,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Thu May 17 03:16:42 UTC 2007
+Sun May 27 02:23:21 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -524,14 +524,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Thu May 17 03:16:47 UTC 2007
+Sun May 27 02:23:26 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
+dsh: Process terminated (before write).
 b: b
 c: c
-dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -636,7 +636,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Thu May 17 12:16:49 JST 2007
-pbuilder-time-stamp: 1179371809
+Current time: TIME
+pbuilder-time-stamp: XXXX
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir3/11057 and its subdirectories
+    -> removing directory /TESTDIR/dir3/12244 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-sid.log b/testsuite/normal/pdebuild-normal-sid.log
index e16c1ba..1f1e78c 100644
--- a/testsuite/normal/pdebuild-normal-sid.log
+++ b/testsuite/normal/pdebuild-normal-sid.log
@@ -7,14 +7,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Entering directory `/TESTDIR/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/TESTDIR/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -28,10 +28,10 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: source only upload (original source is included)
 W: /home/dancer/.pbuilderrc does not exist
 I: using fakeroot in build.
-Current time: Thu May 17 12:03:52 JST 2007
-pbuilder-time-stamp: 1179371032
+Current time: TIME
+pbuilder-time-stamp: XXXX
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/testimage]
+ -> extracting base tarball [/TESTDIR/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -57,10 +57,10 @@ The following NEW packages will be installed:
   debhelper file gettext gettext-base html2text intltool-debian libdshconfig1
   libdshconfig1-dev libmagic1 po-debconf
 0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
-Need to get 3546kB of archives.
+Need to get 3549kB of archives.
 After unpacking 12.0MB of additional disk space will be used.
-Get:1 http://cdn.debian.or.jp sid/main libmagic1 4.20-5 [327kB]
-Get:2 http://cdn.debian.or.jp sid/main file 4.20-5 [39.2kB]
+Get:1 http://cdn.debian.or.jp sid/main libmagic1 4.20-8 [329kB]
+Get:2 http://cdn.debian.or.jp sid/main file 4.20-8 [39.6kB]
 Get:3 http://cdn.debian.or.jp sid/main gettext-base 0.16.1-1 [132kB]
 Get:4 http://cdn.debian.or.jp sid/main html2text 1.3.2a-3 [92.7kB]
 Get:5 http://cdn.debian.or.jp sid/main gettext 0.16.1-1 [2261kB]
@@ -69,12 +69,12 @@ Get:7 http://cdn.debian.or.jp sid/main po-debconf 1.0.8 [111kB]
 Get:8 http://cdn.debian.or.jp sid/main debhelper 5.0.49 [517kB]
 Get:9 http://cdn.debian.or.jp sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3546kB in 1s (3330kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11040 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.20-5_amd64.deb) ...
+(Reading database ... 11070 files and directories currently installed.)
+Unpacking libmagic1 (from .../libmagic1_4.20-8_amd64.deb) ...
 Selecting previously deselected package file.
-Unpacking file (from .../archives/file_4.20-5_amd64.deb) ...
+Unpacking file (from .../archives/file_4.20-8_amd64.deb) ...
 Selecting previously deselected package gettext-base.
 Unpacking gettext-base (from .../gettext-base_0.16.1-1_amd64.deb) ...
 Selecting previously deselected package html2text.
@@ -91,9 +91,9 @@ Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.12-2_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
 Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.12-2_amd64.deb) ...
-Setting up libmagic1 (4.20-5) ...
+Setting up libmagic1 (4.20-8) ...
 
-Setting up file (4.20-5) ...
+Setting up file (4.20-8) ...
 Setting up gettext-base (0.16.1-1) ...
 
 Setting up html2text (1.3.2a-3) ...
@@ -115,9 +115,9 @@ The following NEW packages will be installed:
 Need to get 111kB of archives.
 After unpacking 451kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main fakeroot 1.7.1 [111kB]
-Fetched 111kB in 0s (311kB/s)
+Fetched XXkB in Xs (XXXXkB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11715 files and directories currently installed.)
+(Reading database ... 11745 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.7.1_amd64.deb) ...
 Setting up fakeroot (1.7.1) ...
 
@@ -438,7 +438,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Thu May 17 03:04:38 UTC 2007
+Sun May 27 02:04:15 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -508,14 +508,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Thu May 17 03:04:43 UTC 2007
+Sun May 27 02:04:20 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
+dsh: Process terminated (before write).
 b: b
 c: c
-dsh: Process terminated (before write).
-a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -610,7 +610,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Thu May 17 12:04:45 JST 2007
-pbuilder-time-stamp: 1179371085
+Current time: TIME
+pbuilder-time-stamp: XXXX
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.nKjau28087/dir3/13950 and its subdirectories
+    -> removing directory /TESTDIR/dir3/31345 and its subdirectories
diff --git a/testsuite/run-test-cdebootstrap.log b/testsuite/run-test-cdebootstrap.log
index 8482953..7b315fd 100644
--- a/testsuite/run-test-cdebootstrap.log
+++ b/testsuite/run-test-cdebootstrap.log
@@ -6,12 +6,12 @@
 [OK]   build-etch-dsh
 [OK]   pdebuild-etch-dsh
 [OK]   pdebuild-internal-etch-dsh
-[OK]   update-etch-etch.log
-[OK]   update-etch-lenny-sid.log
-[OK]   update-etch-sid-experimental.log
+[OK]   update-etch-etch
+[OK]   update-etch-lenny-sid
+[OK]   update-etch-sid-experimental
 [OK]   create-lenny-cdebootstrap
 [OK]   build-lenny-dsh
 [OK]   pdebuild-lenny-dsh
 [OK]   pdebuild-internal-lenny-dsh
-[OK]   update-lenny-sid.log
-[OK]   update-lenny-sid-experimental.log
+[OK]   update-lenny-sid
+[OK]   update-lenny-sid-experimental
diff --git a/testsuite/run-test.log b/testsuite/run-test.log
index 29286ef..d8320ae 100644
--- a/testsuite/run-test.log
+++ b/testsuite/run-test.log
@@ -6,12 +6,12 @@
 [OK]   build-etch-dsh
 [OK]   pdebuild-etch-dsh
 [OK]   pdebuild-internal-etch-dsh
-[OK]   update-etch-etch.log
-[OK]   update-etch-lenny-sid.log
-[OK]   update-etch-sid-experimental.log
+[OK]   update-etch-etch
+[OK]   update-etch-lenny-sid
+[OK]   update-etch-sid-experimental
 [OK]   create-lenny-debootstrap
 [OK]   build-lenny-dsh
 [OK]   pdebuild-lenny-dsh
 [OK]   pdebuild-internal-lenny-dsh
-[OK]   update-lenny-sid.log
-[OK]   update-lenny-sid-experimental.log
+[OK]   update-lenny-sid
+[OK]   update-lenny-sid-experimental
author	Junichi Uekawa <dancer@dancer64.netfort.gr.jp>	2007-05-27 11:57:24 +0900
committer	Junichi Uekawa <dancer@dancer64.netfort.gr.jp>	2007-05-27 11:57:24 +0900
commit	9b3c5e1f2116569d9e4ec8e7dcf00ed624873ae7 (patch)
tree	a542f74f4741f9fd6a804ec716d7c9431fced149 /testsuite
parent	26a31b0fbc0cd85c73abf7997e6917f300d364cf (diff)
download	pbuilder-9b3c5e1f2116569d9e4ec8e7dcf00ed624873ae7.tar pbuilder-9b3c5e1f2116569d9e4ec8e7dcf00ed624873ae7.tar.gz