test update

12 files changed, 369 insertions, 351 deletions

diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
index b0625af..a0e68b1 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
@@ -2,10 +2,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sun Apr  1 12:26:34 JST 2007
-pbuilder-time-stamp: 1175397994
+Current time: Mon Apr  9 12:47:44 JST 2007
+pbuilder-time-stamp: 1176090464
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -32,10 +32,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 3483kB of archives.
+Need to get 3482kB of archives.
 After unpacking 11.9MB of additional disk space will be used.
-Get:1 http://ftp.jp.debian.org etch/main libmagic1 4.17-5 [277kB]
-Get:2 http://ftp.jp.debian.org etch/main file 4.17-5 [32.0kB]
+Get:1 http://ftp.jp.debian.org etch/main libmagic1 4.17-5etch1 [276kB]
+Get:2 http://ftp.jp.debian.org etch/main file 4.17-5etch1 [32.1kB]
 Get:3 http://ftp.jp.debian.org etch/main gettext-base 0.16.1-1 [132kB]
 Get:4 http://ftp.jp.debian.org etch/main html2text 1.3.2a-3 [92.7kB]
 Get:5 http://ftp.jp.debian.org etch/main gettext 0.16.1-1 [2261kB]
@@ -44,12 +44,12 @@ Get:7 http://ftp.jp.debian.org etch/main po-debconf 1.0.8 [111kB]
 Get:8 http://ftp.jp.debian.org etch/main debhelper 5.0.42 [510kB]
 Get:9 http://ftp.jp.debian.org etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://ftp.jp.debian.org etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3483kB in 6s (544kB/s)
+Fetched 3482kB in 28s (123kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12033 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.17-5_amd64.deb) ...
+Unpacking libmagic1 (from .../libmagic1_4.17-5etch1_amd64.deb) ...
 Selecting previously deselected package file.
-Unpacking file (from .../archives/file_4.17-5_amd64.deb) ...
+Unpacking file (from .../file_4.17-5etch1_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.
@@ -66,9 +66,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.17-5) ...
+Setting up libmagic1 (4.17-5etch1) ...
 
-Setting up file (4.17-5) ...
+Setting up file (4.17-5etch1) ...
 Setting up gettext-base (0.16.1-1) ...
 
 Setting up html2text (1.3.2a-3) ...
@@ -90,16 +90,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://ftp.jp.debian.org etch/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (330kB/s)
+Fetched 97.4kB in 2s (41.6kB/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.SIsOp23010/dir1/dsh_0.25.7-1.dsc]
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir1/dsh_0.25.7.orig.tar.gz]
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir1/dsh_0.25.7-1.diff.gz]
+    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir1/dsh_0.25.7-1.dsc]
+    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir1/dsh_0.25.7.orig.tar.gz]
+    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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
@@ -423,11 +423,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
-Sun Apr  1 03:27:37 UTC 2007
+Mon Apr  9 03:48:51 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
@@ -497,14 +497,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
-Sun Apr  1 03:27:42 UTC 2007
+Mon Apr  9 03:48:56 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-b: b
 c: c
 dsh: Process terminated (before write).
 a: a
+b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -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: Sun Apr  1 12:27:47 JST 2007
-pbuilder-time-stamp: 1175398067
+Current time: Mon Apr  9 12:48:58 JST 2007
+pbuilder-time-stamp: 1176090538
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir1/9789 and its subdirectories
+    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir1/7607 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
index 748759f..2c8e64f 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
@@ -2,10 +2,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sun Apr  1 12:17:59 JST 2007
-pbuilder-time-stamp: 1175397479
+Current time: Mon Apr  9 12:34:42 JST 2007
+pbuilder-time-stamp: 1176089682
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -32,10 +32,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 3534kB of archives.
+Need to get 3539kB of archives.
 After unpacking 12.0MB of additional disk space will be used.
-Get:1 http://ftp.jp.debian.org sid/main libmagic1 4.20-3 [323kB]
-Get:2 http://ftp.jp.debian.org sid/main file 4.20-3 [38.1kB]
+Get:1 http://ftp.jp.debian.org sid/main libmagic1 4.20-4 [326kB]
+Get:2 http://ftp.jp.debian.org sid/main file 4.20-4 [38.7kB]
 Get:3 http://ftp.jp.debian.org sid/main gettext-base 0.16.1-1 [132kB]
 Get:4 http://ftp.jp.debian.org sid/main html2text 1.3.2a-3 [92.7kB]
 Get:5 http://ftp.jp.debian.org sid/main gettext 0.16.1-1 [2261kB]
@@ -44,12 +44,12 @@ Get:7 http://ftp.jp.debian.org sid/main po-debconf 1.0.8 [111kB]
 Get:8 http://ftp.jp.debian.org sid/main debhelper 5.0.42 [510kB]
 Get:9 http://ftp.jp.debian.org sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://ftp.jp.debian.org sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3534kB in 4s (820kB/s)
+Fetched 3539kB in 22s (160kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 12040 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.20-3_amd64.deb) ...
+(Reading database ... 12041 files and directories currently installed.)
+Unpacking libmagic1 (from .../libmagic1_4.20-4_amd64.deb) ...
 Selecting previously deselected package file.
-Unpacking file (from .../archives/file_4.20-3_amd64.deb) ...
+Unpacking file (from .../archives/file_4.20-4_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.
@@ -66,9 +66,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-3) ...
+Setting up libmagic1 (4.20-4) ...
 
-Setting up file (4.20-3) ...
+Setting up file (4.20-4) ...
 Setting up gettext-base (0.16.1-1) ...
 
 Setting up html2text (1.3.2a-3) ...
@@ -90,16 +90,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://ftp.jp.debian.org sid/main fakeroot 1.6.5 [103kB]
-Fetched 103kB in 0s (190kB/s)
+Fetched 103kB in 1s (75.4kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12712 files and directories currently installed.)
+(Reading database ... 12713 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.SIsOp23010/dir1/dsh_0.25.7-1.dsc]
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir1/dsh_0.25.7.orig.tar.gz]
-    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir1/dsh_0.25.7-1.diff.gz]
+    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir1/dsh_0.25.7-1.dsc]
+    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir1/dsh_0.25.7.orig.tar.gz]
+    -> copying [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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
@@ -423,11 +423,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
-Sun Apr  1 03:19:11 UTC 2007
+Mon Apr  9 03:35:46 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
@@ -497,13 +497,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
-Sun Apr  1 03:19:16 UTC 2007
+Mon Apr  9 03:35:51 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
@@ -608,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: Sun Apr  1 12:19:19 JST 2007
-pbuilder-time-stamp: 1175397559
+Current time: Mon Apr  9 12:35:53 JST 2007
+pbuilder-time-stamp: 1176089753
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir1/5566 and its subdirectories
+    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir1/3515 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-etch.log b/testsuite/cdebootstrap/pbuilder-create-etch.log
index 026ac82..fcf83a8 100644
--- a/testsuite/cdebootstrap/pbuilder-create-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-create-etch.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:
@@ -1023,8 +1022,8 @@ O: (Reading database ...
 O: 5215 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]
-O: Get:2 bootstrap: . Release [74.4kB]
+O: Get:1 bootstrap: . Release.gpg [378B]
+O: Get:2 bootstrap: . Release [58.2kB]
 O: Reading package lists...
 O: 
 O: Reading package lists...
@@ -1360,16 +1359,16 @@ 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//23392/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//21339/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
  -> installing dummy policy-rc.d
-Get:1 http://ftp.jp.debian.org etch Release.gpg [189B]
-Get:2 http://ftp.jp.debian.org etch Release [74.4kB]
-Get:3 http://ftp.jp.debian.org etch/main Packages [5552kB]
-Fetched 5626kB in 2s (1945kB/s)
+Get:1 http://ftp.jp.debian.org etch Release.gpg [378B]
+Get:2 http://ftp.jp.debian.org etch Release [58.2kB]
+Get:3 http://ftp.jp.debian.org etch/main Packages [5549kB]
+Fetched 5608kB in 20s (271kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -1413,7 +1412,7 @@ Get:14 http://ftp.jp.debian.org etch/main g++ 4:4.1.1-15 [1358B]
 Get:15 http://ftp.jp.debian.org etch/main make 3.81-2 [390kB]
 Get:16 http://ftp.jp.debian.org etch/main dpkg-dev 1.13.25 [166kB]
 Get:17 http://ftp.jp.debian.org etch/main build-essential 11.3 [6982B]
-Fetched 21.2MB in 25s (833kB/s)
+Fetched 21.2MB in 2m1s (175kB/s)
 Selecting previously deselected package patch.
 (Reading database ... 7112 files and directories currently installed.)
 Unpacking patch (from .../patch_2.5.9-4_amd64.deb) ...
@@ -1479,9 +1478,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//23392/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//21339/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.SIsOp23010/testimage]
+ -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//23392 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//21339 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-sid.log b/testsuite/cdebootstrap/pbuilder-create-sid.log
index 1963194..efbb6c8 100644
--- a/testsuite/cdebootstrap/pbuilder-create-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-create-sid.log
@@ -514,7 +514,7 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking mawk (from .../mawk_1.3.3-11_amd64.deb) ...
 P: Unpacking package mawk
 O: Selecting previously deselected package base-files.
-O: Unpacking base-files (from .../base-files_4_amd64.deb) ...
+O: Unpacking base-files (from .../base-files_4.0_amd64.deb) ...
 P: Unpacking package base-files
 O: Selecting previously deselected package bash.
 O: dpkg: regarding .../bash_3.1dfsg-8_amd64.deb containing bash, pre-dependency problem:
@@ -687,11 +687,11 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking sysvinit (from .../sysvinit_2.86.ds1-38_amd64.deb) ...
 P: Unpacking package sysvinit
 O: Selecting previously deselected package tar.
-O: dpkg: regarding .../bootstrap/tar_1.16-2_amd64.deb containing tar, pre-dependency problem:
+O: dpkg: regarding .../tar_1.16.1-1_amd64.deb containing tar, pre-dependency problem:
 O:  tar pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking tar (from .../bootstrap/tar_1.16-2_amd64.deb) ...
+O: Unpacking tar (from .../tar_1.16.1-1_amd64.deb) ...
 P: Unpacking package tar
 O: Selecting previously deselected package util-linux.
 O: dpkg: regarding .../util-linux_2.12r-19_amd64.deb containing util-linux, pre-dependency problem:
@@ -757,7 +757,7 @@ P: Configuring package libsepol1
 O: telinit: 
 O: /dev/initctl: No such file or directory
 O: 
-O: Setting up tar (1.16-2) ...
+O: Setting up tar (1.16.1-1) ...
 P: Configuring package tar
 O: 
 O: Setting up zlib1g (1.2.3-13) ...
@@ -838,7 +838,7 @@ P: Configuring package ncurses-bin
 O: Setting up libpam-modules (0.79-4) ...
 P: Configuring package libpam-modules
 O: 
-O: Setting up base-files (4) ...
+O: Setting up base-files (4.0) ...
 P: Configuring package base-files
 O: 
 O: Setting up libblkid1 (1.39+1.40-WIP-2006.11.14+dfsg-2) ...
@@ -890,7 +890,7 @@ P: Configuring package debconf
 O: 
 O: Selecting previously deselected package libbz2-1.0.
 O: (Reading database ... 
-O: 4819 files and directories currently installed.)
+O: 4820 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.
@@ -1018,7 +1018,8 @@ O:              unchanged: 3
 O: 
 P: Configuring helper cdebootstrap-helper-apt
 O: Selecting previously deselected package cdebootstrap-helper-apt.
-O: (Reading database ... 5221 files and directories currently installed.)
+O: (Reading database ... 
+O: 5222 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]
@@ -1026,6 +1027,7 @@ O: Get:2 bootstrap: . Release [79.6kB]
 O: Reading package lists...
 O: 
 O: Reading package lists...
+O: 
 O: Building dependency tree...
 O: 
 O: Suggested packages:
@@ -1058,7 +1060,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: 5222 files and directories currently installed.)
+O: 5223 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.
@@ -1332,18 +1334,18 @@ P: Configuring package tasksel
 O: 
 P: Deconfiguring helper cdebootstrap-helper-apt
 O: (Reading database ... 
-O: 7122 files and directories currently installed.)
+O: 7123 files and directories currently installed.)
 O: Removing cdebootstrap-helper-apt ...
 P: Deconfiguring helper cdebootstrap-helper-diverts
 O: (Reading database ... 
-O: 7121 files and directories currently installed.)
+O: 7122 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: 7119 files and directories currently installed.)
+O: 7120 files and directories currently installed.)
 O: Removing cdebootstrap-helper-makedev ...
 O: Reading package lists...
 O: 
@@ -1356,7 +1358,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//19278/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//17238/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
@@ -1364,8 +1366,8 @@ Refreshing the base.tgz
  -> installing dummy policy-rc.d
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org sid Release [79.6kB]
-Get:3 http://ftp.jp.debian.org sid/main Packages [5963kB]
-Fetched 6043kB in 3s (1559kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [5970kB]
+Fetched 6050kB in 21s (285kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -1408,9 +1410,9 @@ Get:14 http://ftp.jp.debian.org sid/main g++ 4:4.1.1-15 [1358B]
 Get:15 http://ftp.jp.debian.org sid/main make 3.81-3 [395kB]
 Get:16 http://ftp.jp.debian.org sid/main dpkg-dev 1.13.25 [166kB]
 Get:17 http://ftp.jp.debian.org sid/main build-essential 11.3 [6982B]
-Fetched 21.2MB in 20s (1013kB/s)
+Fetched 21.2MB in 1m30s (235kB/s)
 Selecting previously deselected package patch.
-(Reading database ... 7119 files and directories currently installed.)
+(Reading database ... 7120 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) ...
@@ -1474,9 +1476,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//19278/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//17238/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.SIsOp23010/testimage]
+ -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//19278 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//17238 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-etch.log b/testsuite/cdebootstrap/pbuilder-execute-etch.log
index 0a6dcbe..e098067 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.SIsOp23010/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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//27410 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//25351 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-sid.log b/testsuite/cdebootstrap/pbuilder-execute-sid.log
index 28c9786..545592b 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.SIsOp23010/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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//23330 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//21279 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
index 7b160d6..02368f8 100644
--- a/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
+++ b/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
@@ -1,6 +1,6 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/testimage]
  -> creating local configuration
  -> copying local configuration
   -> Installing apt-lines
@@ -15,8 +15,8 @@ Get:2 http://ftp.jp.debian.org experimental Release.gpg [189B]
 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 [709kB]
-Fetched 791kB in 2s (273kB/s)
+Get:5 http://ftp.jp.debian.org experimental/main Packages [695kB]
+Fetched 776kB in 7s (108kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -57,13 +57,13 @@ Get:22 http://ftp.jp.debian.org experimental/main cpp 4:4.1.2-1 [11.8kB]
 Get:23 http://ftp.jp.debian.org experimental/main gcc 4:4.1.2-1 [5048B]
 Get:24 http://ftp.jp.debian.org experimental/main g++ 4:4.1.2-1 [1346B]
 Preconfiguring packages ...
-Fetched 25.0MB in 48s (516kB/s)
-(Reading database ... 12040 files and directories currently installed.)
+Fetched 25.0MB in 2m12s (188kB/s)
+(Reading database ... 12041 files and directories currently installed.)
 Removing tasksel ...
 Removing tasksel-data ...
 Removing aptitude ...
 Selecting previously deselected package gcc-4.2-base.
-(Reading database ... 11805 files and directories currently installed.)
+(Reading database ... 11806 files and directories currently installed.)
 Unpacking gcc-4.2-base (from .../gcc-4.2-base_4.2-20070307-1_amd64.deb) ...
 Preparing to replace binutils 2.17-3 (using .../binutils_2.17.20070210cvs-1_amd64.deb) ...
 Unpacking replacement binutils ...
@@ -75,19 +75,19 @@ Setting up libc6 (2.5-0exp6) ...
 Installing new version of config file /etc/init.d/glibc.sh ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 11880 files and directories currently installed.)
+(Reading database ... 11881 files and directories currently installed.)
 Preparing to replace libgcc1 1:4.1.1-21 (using .../libgcc1_1%3a4.2-20070307-1_amd64.deb) ...
 Unpacking replacement libgcc1 ...
 Setting up gcc-4.2-base (4.2-20070307-1) ...
 
 Setting up libgcc1 (4.2-20070307-1) ...
 
-(Reading database ... 11880 files and directories currently installed.)
+(Reading database ... 11881 files and directories currently installed.)
 Preparing to replace libstdc++6 4.1.1-21 (using .../libstdc++6_4.2-20070307-1_amd64.deb) ...
 Unpacking replacement libstdc++6 ...
 Setting up libstdc++6 (4.2-20070307-1) ...
 
-(Reading database ... 11880 files and directories currently installed.)
+(Reading database ... 11881 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-1_amd64.deb) ...
 Unpacking replacement libstdc++6-4.1-dev ...
 Preparing to replace g++-4.1 4.1.1-21 (using .../g++-4.1_4.1.2-1_amd64.deb) ...
@@ -96,16 +96,16 @@ Preparing to replace gcc-4.1 4.1.1-21 (using .../gcc-4.1_4.1.2-1_amd64.deb) ...
 Unpacking replacement gcc-4.1 ...
 Preparing to replace cpp-4.1 4.1.1-21 (using .../cpp-4.1_4.1.2-1_amd64.deb) ...
 Unpacking replacement cpp-4.1 ...
-(Reading database ... 11866 files and directories currently installed.)
+(Reading database ... 11867 files and directories currently installed.)
 Removing libssp0 ...
-(Reading database ... 11863 files and directories currently installed.)
+(Reading database ... 11864 files and directories currently installed.)
 Preparing to replace gcc-4.1-base 4.1.1-21 (using .../gcc-4.1-base_4.1.2-1_amd64.deb) ...
 Unpacking replacement gcc-4.1-base ...
 Preparing to replace coreutils 5.97-5.3 (using .../coreutils_6.0-1_amd64.deb) ...
 Unpacking replacement coreutils ...
 Setting up coreutils (6.0-1) ...
 
-(Reading database ... 11875 files and directories currently installed.)
+(Reading database ... 11876 files and directories currently installed.)
 Preparing to replace apt-utils 0.6.46.4-0.1 (using .../apt-utils_0.7.0_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Preparing to replace apt 0.6.46.4-0.1 (using .../archives/apt_0.7.0_amd64.deb) ...
@@ -118,7 +118,7 @@ gpg: key ADB11277: "Etch Stable Release Key <debian-release@lists.debian.org>" n
 gpg: Total number processed: 3
 gpg:              unchanged: 3
 
-(Reading database ... 11877 files and directories currently installed.)
+(Reading database ... 11878 files and directories currently installed.)
 Preparing to replace cpio 2.6-17 (using .../cpio_2.7-0exp1_amd64.deb) ...
 Unpacking replacement cpio ...
 Preparing to replace libgcrypt11 1.2.3-2 (using .../libgcrypt11_1.2.4-1_amd64.deb) ...
@@ -184,9 +184,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//28208/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//26152/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.SIsOp23010/testimage]
+ -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//28208 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//26152 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
index 6a2fd81..cd1ec05 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.SIsOp23010/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/testimage]
  -> creating local configuration
  -> copying local configuration
   -> Installing apt-lines
@@ -11,47 +11,49 @@ Refreshing the base.tgz
  -> upgrading packages
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org sid Release [79.6kB]
-Get:3 http://ftp.jp.debian.org sid/main Packages [5963kB]
-Fetched 6043kB in 10s (562kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [5970kB]
+Fetched 6050kB in 8s (751kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
 Building dependency tree...
 The following packages will be upgraded:
-  debconf debconf-i18n debianutils dhcp3-client dhcp3-common findutils gzip
-  klogd laptop-detect libacl1 libattr1 libdevmapper1.02 libgpg-error0 libldap2
-  libsepol1 libssl0.9.8 libusb-0.1-4 make manpages nano netcat sysklogd tzdata
-  vim-common vim-tiny
-25 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
-Need to get 5389kB of archives.
-After unpacking 111kB of additional disk space will be used.
+  base-files debconf debconf-i18n debianutils dhcp3-client dhcp3-common
+  findutils gzip klogd laptop-detect libacl1 libattr1 libdevmapper1.02
+  libgpg-error0 libldap2 libsepol1 libssl0.9.8 libusb-0.1-4 make manpages nano
+  netcat sysklogd tar tzdata vim-common vim-tiny
+27 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Need to get 6162kB of archives.
+After unpacking 172kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main debianutils 2.18 [52.5kB]
 Get:2 http://ftp.jp.debian.org sid/main findutils 4.2.28-2 [356kB]
 Get:3 http://ftp.jp.debian.org sid/main gzip 1.3.9-2 [80.5kB]
-Get:4 http://ftp.jp.debian.org sid/main debconf-i18n 1.5.13 [151kB]
-Get:5 http://ftp.jp.debian.org sid/main debconf 1.5.13 [148kB]
-Get:6 http://ftp.jp.debian.org sid/main libattr1 1:2.4.32-1.1 [9976B]
-Get:7 http://ftp.jp.debian.org sid/main libacl1 2.2.42-1 [16.1kB]
-Get:8 http://ftp.jp.debian.org sid/main libsepol1 1.14-3 [125kB]
-Get:9 http://ftp.jp.debian.org sid/main tzdata 2007d-1 [354kB]
-Get:10 http://ftp.jp.debian.org sid/main dhcp3-client 3.0.4-14 [222kB]
-Get:11 http://ftp.jp.debian.org sid/main dhcp3-common 3.0.4-14 [287kB]
-Get:12 http://ftp.jp.debian.org sid/main sysklogd 1.4.1-20 [60.2kB]
-Get:13 http://ftp.jp.debian.org sid/main klogd 1.4.1-20 [40.7kB]
-Get:14 http://ftp.jp.debian.org sid/main laptop-detect 0.12.1-0.1 [3666B]
-Get:15 http://ftp.jp.debian.org sid/main libgpg-error0 1.4-2 [34.8kB]
-Get:16 http://ftp.jp.debian.org sid/main libldap2 2.1.30-13.4 [162kB]
-Get:17 http://ftp.jp.debian.org sid/main libssl0.9.8 0.9.8e-4 [896kB]
-Get:18 http://ftp.jp.debian.org sid/main libusb-0.1-4 2:0.1.12-6 [20.3kB]
-Get:19 http://ftp.jp.debian.org sid/main manpages 2.43-0 [490kB]
-Get:20 http://ftp.jp.debian.org sid/main nano 2.0.3-1 [570kB]
-Get:21 http://ftp.jp.debian.org sid/main netcat 1.10-33 [68.3kB]
-Get:22 http://ftp.jp.debian.org sid/main vim-tiny 1:7.0-219+1 [617kB]
-Get:23 http://ftp.jp.debian.org sid/main vim-common 1:7.0-219+1 [185kB]
-Get:24 http://ftp.jp.debian.org sid/main libdevmapper1.02 2:1.02.12-1 [42.0kB]
-Get:25 http://ftp.jp.debian.org sid/main make 3.81-3 [395kB]
+Get:4 http://ftp.jp.debian.org sid/main tar 1.16.1-1 [734kB]
+Get:5 http://ftp.jp.debian.org sid/main base-files 4.0 [39.9kB]
+Get:6 http://ftp.jp.debian.org sid/main debconf-i18n 1.5.13 [151kB]
+Get:7 http://ftp.jp.debian.org sid/main debconf 1.5.13 [148kB]
+Get:8 http://ftp.jp.debian.org sid/main libattr1 1:2.4.32-1.1 [9976B]
+Get:9 http://ftp.jp.debian.org sid/main libacl1 2.2.42-1 [16.1kB]
+Get:10 http://ftp.jp.debian.org sid/main libsepol1 1.14-3 [125kB]
+Get:11 http://ftp.jp.debian.org sid/main tzdata 2007d-1 [354kB]
+Get:12 http://ftp.jp.debian.org sid/main dhcp3-client 3.0.4-14 [222kB]
+Get:13 http://ftp.jp.debian.org sid/main dhcp3-common 3.0.4-14 [287kB]
+Get:14 http://ftp.jp.debian.org sid/main sysklogd 1.4.1-20 [60.2kB]
+Get:15 http://ftp.jp.debian.org sid/main klogd 1.4.1-20 [40.7kB]
+Get:16 http://ftp.jp.debian.org sid/main laptop-detect 0.12.1-0.1 [3666B]
+Get:17 http://ftp.jp.debian.org sid/main libgpg-error0 1.4-2 [34.8kB]
+Get:18 http://ftp.jp.debian.org sid/main libldap2 2.1.30-13.4 [162kB]
+Get:19 http://ftp.jp.debian.org sid/main libssl0.9.8 0.9.8e-4 [896kB]
+Get:20 http://ftp.jp.debian.org sid/main libusb-0.1-4 2:0.1.12-6 [20.3kB]
+Get:21 http://ftp.jp.debian.org sid/main manpages 2.43-0 [490kB]
+Get:22 http://ftp.jp.debian.org sid/main nano 2.0.3-1 [570kB]
+Get:23 http://ftp.jp.debian.org sid/main netcat 1.10-33 [68.3kB]
+Get:24 http://ftp.jp.debian.org sid/main vim-tiny 1:7.0-219+1 [617kB]
+Get:25 http://ftp.jp.debian.org sid/main vim-common 1:7.0-219+1 [185kB]
+Get:26 http://ftp.jp.debian.org sid/main libdevmapper1.02 2:1.02.12-1 [42.0kB]
+Get:27 http://ftp.jp.debian.org sid/main make 3.81-3 [395kB]
 Preconfiguring packages ...
-Fetched 5389kB in 16s (324kB/s)
+Fetched 6162kB in 58s (105kB/s)
 (Reading database ... 12033 files and directories currently installed.)
 Preparing to replace debianutils 2.17 (using .../debianutils_2.18_amd64.deb) ...
 Unpacking replacement debianutils ...
@@ -68,6 +70,19 @@ Unpacking replacement gzip ...
 Setting up gzip (1.3.9-2) ...
 
 (Reading database ... 12033 files and directories currently installed.)
+Preparing to replace tar 1.16-2 (using .../tar_1.16.1-1_amd64.deb) ...
+Unpacking replacement tar ...
+Setting up tar (1.16.1-1) ...
+
+(Reading database ... 12034 files and directories currently installed.)
+Preparing to replace base-files 4 (using .../base-files_4.0_amd64.deb) ...
+Unpacking replacement base-files ...
+Setting up base-files (4.0) ...
+Installing new version of config file /etc/debian_version ...
+Installing new version of config file /etc/issue ...
+Installing new version of config file /etc/issue.net ...
+
+(Reading database ... 12034 files and directories currently installed.)
 Preparing to replace debconf-i18n 1.5.11 (using .../debconf-i18n_1.5.13_all.deb) ...
 Unpacking replacement debconf-i18n ...
 Preparing to replace debconf 1.5.11 (using .../debconf_1.5.13_all.deb) ...
@@ -80,22 +95,22 @@ Setting up libattr1 (2.4.32-1.1) ...
 
 Setting up libacl1 (2.2.42-1) ...
 
-(Reading database ... 12033 files and directories currently installed.)
+(Reading database ... 12034 files and directories currently installed.)
 Preparing to replace libsepol1 1.14-2 (using .../libsepol1_1.14-3_amd64.deb) ...
 Unpacking replacement libsepol1 ...
 Setting up libsepol1 (1.14-3) ...
 telinit: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 12033 files and directories currently installed.)
+(Reading database ... 12034 files and directories currently installed.)
 Preparing to replace tzdata 2007b-1 (using .../tzdata_2007d-1_all.deb) ...
 Unpacking replacement tzdata ...
 Setting up tzdata (2007d-1) ...
 Current default timezone: 'UTC'.
-Local time is now:      Sun Apr  1 03:31:36 UTC 2007.
-Universal Time is now:  Sun Apr  1 03:31:36 UTC 2007.
+Local time is now:      Mon Apr  9 03:52:53 UTC 2007.
+Universal Time is now:  Mon Apr  9 03:52:53 UTC 2007.
 Run 'tzconfig' if you wish to change it.
 
-(Reading database ... 12039 files and directories currently installed.)
+(Reading database ... 12040 files and directories currently installed.)
 Preparing to replace dhcp3-client 3.0.4-13 (using .../dhcp3-client_3.0.4-14_amd64.deb) ...
 Unpacking replacement dhcp3-client ...
 Preparing to replace dhcp3-common 3.0.4-13 (using .../dhcp3-common_3.0.4-14_amd64.deb) ...
@@ -174,9 +189,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//27474/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//25408/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.SIsOp23010/testimage]
+ -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//27474 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//25408 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-etch.log b/testsuite/cdebootstrap/pdebuild-internal-etch.log
index 1a2199f..2143adc 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.SIsOp23010/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2
+-> Mounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2
  -> policy-rc.d already exists
 Using: $
 Reading package lists...
@@ -26,7 +26,7 @@ Get:1 http://ftp.jp.debian.org etch/main libdebian-installer4 0.50 [27.3kB]
 Get:2 http://ftp.jp.debian.org etch/main libdebian-installer-extra4 0.50 [10.5kB]
 Get:3 http://ftp.jp.debian.org etch/main cdebootstrap 0.3.15 [26.7kB]
 Get:4 http://ftp.jp.debian.org etch/main pbuilder 0.161 [82.6kB]
-Fetched 147kB in 2s (64.3kB/s)
+Fetched 147kB in 4s (33.2kB/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) ...
@@ -62,10 +62,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 3483kB of archives.
+Need to get 3482kB of archives.
 After unpacking 11.9MB of additional disk space will be used.
-Get:1 http://ftp.jp.debian.org etch/main libmagic1 4.17-5 [277kB]
-Get:2 http://ftp.jp.debian.org etch/main file 4.17-5 [32.0kB]
+Get:1 http://ftp.jp.debian.org etch/main libmagic1 4.17-5etch1 [276kB]
+Get:2 http://ftp.jp.debian.org etch/main file 4.17-5etch1 [32.1kB]
 Get:3 http://ftp.jp.debian.org etch/main gettext-base 0.16.1-1 [132kB]
 Get:4 http://ftp.jp.debian.org etch/main html2text 1.3.2a-3 [92.7kB]
 Get:5 http://ftp.jp.debian.org etch/main gettext 0.16.1-1 [2261kB]
@@ -74,12 +74,12 @@ Get:7 http://ftp.jp.debian.org etch/main po-debconf 1.0.8 [111kB]
 Get:8 http://ftp.jp.debian.org etch/main debhelper 5.0.42 [510kB]
 Get:9 http://ftp.jp.debian.org etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://ftp.jp.debian.org etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3483kB in 1s (2539kB/s)
+Fetched 3482kB in 1s (2326kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12127 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.17-5_amd64.deb) ...
+Unpacking libmagic1 (from .../libmagic1_4.17-5etch1_amd64.deb) ...
 Selecting previously deselected package file.
-Unpacking file (from .../archives/file_4.17-5_amd64.deb) ...
+Unpacking file (from .../file_4.17-5etch1_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.
@@ -96,9 +96,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.17-5) ...
+Setting up libmagic1 (4.17-5etch1) ...
 
-Setting up file (4.17-5) ...
+Setting up file (4.17-5etch1) ...
 Setting up gettext-base (0.16.1-1) ...
 
 Setting up html2text (1.3.2a-3) ...
@@ -120,7 +120,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://ftp.jp.debian.org etch/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (212kB/s)
+Fetched 97.4kB in 0s (698kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12797 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
@@ -136,14 +136,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.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -338,18 +338,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.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
 Making all in m4
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7/po'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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; \
@@ -362,26 +362,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.SIsOp23010/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
 Making check in m4
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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
 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
+b: 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
@@ -432,7 +432,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
-Sun Apr  1 03:29:59 UTC 2007
+Mon Apr  9 03:50:54 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
@@ -502,12 +502,12 @@ 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
-Sun Apr  1 03:30:04 UTC 2007
+Mon Apr  9 03:50:59 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-a: a
 b: b
+a: a
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -517,9 +517,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7/debian/dsh
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+/usr/bin/make install DESTDIR=/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/debian/dsh
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
 Making install in m4
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7/m4'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
-test -z "/usr/bin" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/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.SIsOp23010/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.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
+test -z "/usr/bin" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.zZzAJ20900/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.zZzAJ20900/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/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.SIsOp23010/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.SIsOp23010/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.SIsOp23010/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.SIsOp23010/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
-cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/dsh.conf /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.zZzAJ20900/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.zZzAJ20900/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.zZzAJ20900/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.zZzAJ20900/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
+cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/debian/machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/dsh.conf /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2 filesystem
+ -> unmounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2 filesystem
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir3/21615 and its subdirectories
+    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir3/19557 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-sid.log b/testsuite/cdebootstrap/pdebuild-internal-sid.log
index 160af4c..ec9f288 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.SIsOp23010/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2
+-> Mounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2
  -> policy-rc.d already exists
 Using: $
 Reading package lists...
@@ -26,9 +26,9 @@ Get:1 http://ftp.jp.debian.org sid/main libdebian-installer4 0.50 [27.3kB]
 Get:2 http://ftp.jp.debian.org sid/main libdebian-installer-extra4 0.50 [10.5kB]
 Get:3 http://ftp.jp.debian.org sid/main cdebootstrap 0.3.15 [26.7kB]
 Get:4 http://ftp.jp.debian.org sid/main pbuilder 0.165 [84.2kB]
-Fetched 149kB in 2s (59.6kB/s)
+Fetched 149kB in 4s (31.3kB/s)
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 12040 files and directories currently installed.)
+(Reading database ... 12041 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.50_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.50_amd64.deb) ...
@@ -62,10 +62,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 3534kB of archives.
+Need to get 3539kB of archives.
 After unpacking 12.0MB of additional disk space will be used.
-Get:1 http://ftp.jp.debian.org sid/main libmagic1 4.20-3 [323kB]
-Get:2 http://ftp.jp.debian.org sid/main file 4.20-3 [38.1kB]
+Get:1 http://ftp.jp.debian.org sid/main libmagic1 4.20-4 [326kB]
+Get:2 http://ftp.jp.debian.org sid/main file 4.20-4 [38.7kB]
 Get:3 http://ftp.jp.debian.org sid/main gettext-base 0.16.1-1 [132kB]
 Get:4 http://ftp.jp.debian.org sid/main html2text 1.3.2a-3 [92.7kB]
 Get:5 http://ftp.jp.debian.org sid/main gettext 0.16.1-1 [2261kB]
@@ -74,12 +74,12 @@ Get:7 http://ftp.jp.debian.org sid/main po-debconf 1.0.8 [111kB]
 Get:8 http://ftp.jp.debian.org sid/main debhelper 5.0.42 [510kB]
 Get:9 http://ftp.jp.debian.org sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://ftp.jp.debian.org sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3534kB in 1s (2561kB/s)
+Fetched 3539kB in 1s (2176kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 12134 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.20-3_amd64.deb) ...
+(Reading database ... 12135 files and directories currently installed.)
+Unpacking libmagic1 (from .../libmagic1_4.20-4_amd64.deb) ...
 Selecting previously deselected package file.
-Unpacking file (from .../archives/file_4.20-3_amd64.deb) ...
+Unpacking file (from .../archives/file_4.20-4_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.
@@ -96,9 +96,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-3) ...
+Setting up libmagic1 (4.20-4) ...
 
-Setting up file (4.20-3) ...
+Setting up file (4.20-4) ...
 Setting up gettext-base (0.16.1-1) ...
 
 Setting up html2text (1.3.2a-3) ...
@@ -120,9 +120,9 @@ 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://ftp.jp.debian.org sid/main fakeroot 1.6.5 [103kB]
-Fetched 103kB in 0s (651kB/s)
+Fetched 103kB in 0s (634kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12806 files and directories currently installed.)
+(Reading database ... 12807 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.6.5_amd64.deb) ...
 Setting up fakeroot (1.6.5) ...
 
@@ -136,14 +136,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.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -338,18 +338,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.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
 Making all in m4
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7/po'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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; \
@@ -362,26 +362,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.SIsOp23010/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
 Making check in m4
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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
@@ -393,6 +393,7 @@ 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
@@ -417,8 +418,8 @@ 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
+b: 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
@@ -431,7 +432,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
-Sun Apr  1 03:21:42 UTC 2007
+Mon Apr  9 03:38:02 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 +502,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
-Sun Apr  1 03:21:47 UTC 2007
+Mon Apr  9 03:38:07 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
+b: b
 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.SIsOp23010/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7/debian/dsh
-make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
+/usr/bin/make install DESTDIR=/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/debian/dsh
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
 Making install in m4
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7/m4'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
-make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
-test -z "/usr/bin" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/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.SIsOp23010/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.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
+test -z "/usr/bin" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.zZzAJ20900/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.zZzAJ20900/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/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.SIsOp23010/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.SIsOp23010/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.SIsOp23010/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.SIsOp23010/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7'
-cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/dsh.conf /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.zZzAJ20900/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.zZzAJ20900/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.zZzAJ20900/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.zZzAJ20900/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
+cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/debian/machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/dsh.conf /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2 filesystem
+ -> unmounting /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2 filesystem
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir3/17532 and its subdirectories
+    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir3/15485 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-etch.log b/testsuite/cdebootstrap/pdebuild-normal-etch.log
index cf24a0e..5f82256 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.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -31,10 +31,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sun Apr  1 12:27:54 JST 2007
-pbuilder-time-stamp: 1175398074
+Current time: Mon Apr  9 12:49:02 JST 2007
+pbuilder-time-stamp: 1176090542
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -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 3483kB of archives.
+Need to get 3482kB of archives.
 After unpacking 11.9MB of additional disk space will be used.
-Get:1 http://ftp.jp.debian.org etch/main libmagic1 4.17-5 [277kB]
-Get:2 http://ftp.jp.debian.org etch/main file 4.17-5 [32.0kB]
+Get:1 http://ftp.jp.debian.org etch/main libmagic1 4.17-5etch1 [276kB]
+Get:2 http://ftp.jp.debian.org etch/main file 4.17-5etch1 [32.1kB]
 Get:3 http://ftp.jp.debian.org etch/main gettext-base 0.16.1-1 [132kB]
 Get:4 http://ftp.jp.debian.org etch/main html2text 1.3.2a-3 [92.7kB]
 Get:5 http://ftp.jp.debian.org etch/main gettext 0.16.1-1 [2261kB]
@@ -73,12 +73,12 @@ Get:7 http://ftp.jp.debian.org etch/main po-debconf 1.0.8 [111kB]
 Get:8 http://ftp.jp.debian.org etch/main debhelper 5.0.42 [510kB]
 Get:9 http://ftp.jp.debian.org etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://ftp.jp.debian.org etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3483kB in 5s (621kB/s)
+Fetched 3482kB in 2s (1580kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 12033 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.17-5_amd64.deb) ...
+Unpacking libmagic1 (from .../libmagic1_4.17-5etch1_amd64.deb) ...
 Selecting previously deselected package file.
-Unpacking file (from .../archives/file_4.17-5_amd64.deb) ...
+Unpacking file (from .../file_4.17-5etch1_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.17-5) ...
+Setting up libmagic1 (4.17-5etch1) ...
 
-Setting up file (4.17-5) ...
+Setting up file (4.17-5etch1) ...
 Setting up gettext-base (0.16.1-1) ...
 
 Setting up html2text (1.3.2a-3) ...
@@ -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://ftp.jp.debian.org etch/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (940kB/s)
+Fetched 97.4kB in 0s (241kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 12703 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
@@ -457,7 +457,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
-Sun Apr  1 03:28:51 UTC 2007
+Mon Apr  9 03:49:50 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
@@ -527,11 +527,12 @@ 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
-Sun Apr  1 03:28:56 UTC 2007
+Mon Apr  9 03:49:55 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
 PASS: tests/segv-catcher.sh
@@ -638,7 +639,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: Sun Apr  1 12:28:58 JST 2007
-pbuilder-time-stamp: 1175398138
+Current time: Mon Apr  9 12:49:57 JST 2007
+pbuilder-time-stamp: 1176090597
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir3/15818 and its subdirectories
+    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir3/13757 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-sid.log b/testsuite/cdebootstrap/pdebuild-normal-sid.log
index fcdb8ca..d29dbb7 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.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/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.SIsOp23010/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -31,10 +31,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sun Apr  1 12:19:27 JST 2007
-pbuilder-time-stamp: 1175397567
+Current time: Mon Apr  9 12:36:06 JST 2007
+pbuilder-time-stamp: 1176089766
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -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 3534kB of archives.
+Need to get 3539kB of archives.
 After unpacking 12.0MB of additional disk space will be used.
-Get:1 http://ftp.jp.debian.org sid/main libmagic1 4.20-3 [323kB]
-Get:2 http://ftp.jp.debian.org sid/main file 4.20-3 [38.1kB]
+Get:1 http://ftp.jp.debian.org sid/main libmagic1 4.20-4 [326kB]
+Get:2 http://ftp.jp.debian.org sid/main file 4.20-4 [38.7kB]
 Get:3 http://ftp.jp.debian.org sid/main gettext-base 0.16.1-1 [132kB]
 Get:4 http://ftp.jp.debian.org sid/main html2text 1.3.2a-3 [92.7kB]
 Get:5 http://ftp.jp.debian.org sid/main gettext 0.16.1-1 [2261kB]
@@ -73,12 +73,12 @@ Get:7 http://ftp.jp.debian.org sid/main po-debconf 1.0.8 [111kB]
 Get:8 http://ftp.jp.debian.org sid/main debhelper 5.0.42 [510kB]
 Get:9 http://ftp.jp.debian.org sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://ftp.jp.debian.org sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3534kB in 1s (2324kB/s)
+Fetched 3539kB in 1s (2066kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 12040 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.20-3_amd64.deb) ...
+(Reading database ... 12041 files and directories currently installed.)
+Unpacking libmagic1 (from .../libmagic1_4.20-4_amd64.deb) ...
 Selecting previously deselected package file.
-Unpacking file (from .../archives/file_4.20-3_amd64.deb) ...
+Unpacking file (from .../archives/file_4.20-4_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-3) ...
+Setting up libmagic1 (4.20-4) ...
 
-Setting up file (4.20-3) ...
+Setting up file (4.20-4) ...
 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 103kB of archives.
 After unpacking 430kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.6.5 [103kB]
-Fetched 103kB in 0s (1103kB/s)
+Fetched 103kB in 0s (589kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12712 files and directories currently installed.)
+(Reading database ... 12713 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.6.5_amd64.deb) ...
 Setting up fakeroot (1.6.5) ...
 
@@ -443,8 +443,8 @@ 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
+b: 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
@@ -457,7 +457,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
-Sun Apr  1 03:20:29 UTC 2007
+Mon Apr  9 03:36:58 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
@@ -527,13 +527,12 @@ 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
-Sun Apr  1 03:20:34 UTC 2007
+Mon Apr  9 03:37:03 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-b: b
-dsh: Process terminated (before write).
 a: a
+b: b
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -639,7 +638,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: Sun Apr  1 12:20:40 JST 2007
-pbuilder-time-stamp: 1175397640
+Current time: Mon Apr  9 12:37:05 JST 2007
+pbuilder-time-stamp: 1176089825
  -> cleaning the build env 
-    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.SIsOp23010/dir3/11736 and its subdirectories
+    -> removing directory /home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.zZzAJ20900/dir3/9688 and its subdirectories