update testsuite results, all successful.

remove testsuite/regression/344089-initscripts-inetd-workaround-check.sh, since the problem is now gone.
author: dancer <dancer> 2006-02-22 15:13:33 +0000
committer: dancer <dancer> 2006-02-22 15:13:33 +0000
commit: f3a31e42bee44bf0471e08613fa0729486705bed (patch)
tree: e20cc692dce7ec31bdd55063ed1f96d73f172c08 /testsuite
parent: 1181cd7f3600c3a4d80ac3637bf6aa7b6027e11b (diff)
download: pbuilder-f3a31e42bee44bf0471e08613fa0729486705bed.tar
pbuilder-f3a31e42bee44bf0471e08613fa0729486705bed.tar.gz
41 files changed, 1250 insertions, 1502 deletions
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
index 8f508ff..1771d53 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
@@ -2,14 +2,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Feb 18 12:48:30 JST 2006
-pbuilder-time-stamp: 1140234510
+Current time: Wed Feb 22 12:38:29 JST 2006
+pbuilder-time-stamp: 1140579509
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/873/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/18196/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -40,7 +40,7 @@ WARNING: The following packages cannot be authenticated!
   gettext-base libmagic1 file debconf-utils html2text gettext intltool-debian
   po-debconf debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package gettext-base.
-(Reading database ... 10991 files and directories currently installed.)
+(Reading database ... 11066 files and directories currently installed.)
 Unpacking gettext-base (from .../gettext-base_0.14.5-2_amd64.deb) ...
 Selecting previously deselected package libmagic1.
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
@@ -90,17 +90,17 @@ After unpacking 406kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 11661 files and directories currently installed.)
+(Reading database ... 11736 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.7_amd64.deb) ...
 Setting up fakeroot (1.5.7) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/873/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/873/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/18196/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/18196/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -384,7 +384,6 @@ test to check that unknown parameter checking is right.
 PASS: tests/param-unknown.sh
 test1
 test2
-dsh: Process terminated (before write).
 PASS: tests/param-i.sh
 Check that cn4 option is working.
 PASS: tests/param-cn4.sh
@@ -419,11 +418,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
-Sat Feb 18 03:49:33 UTC 2006
+Wed Feb 22 03:39:12 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -493,13 +492,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
-Sat Feb 18 03:49:38 UTC 2006
+Wed Feb 22 03:39:17 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
 b: b
 dsh: Process terminated (before write).
-a: a
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -623,7 +622,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Feb 18 12:49:41 JST 2006
-pbuilder-time-stamp: 1140234581
+Current time: Wed Feb 22 12:39:19 JST 2006
+pbuilder-time-stamp: 1140579559
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/873 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/18196 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log b/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log
index 55d98c7..5ea29af 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log
@@ -2,14 +2,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Feb 18 12:37:15 JST 2006
-pbuilder-time-stamp: 1140233835
+Current time: Wed Feb 22 12:28:57 JST 2006
+pbuilder-time-stamp: 1140578937
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/31813/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/16713/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -86,12 +86,12 @@ Unpacking fakeroot (from .../fakeroot_1.2.10_amd64.deb) ...
 Setting up fakeroot (1.2.10) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/31813/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/31813/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/16713/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/16713/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -409,7 +409,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
-Sat Feb 18 03:38:08 UTC 2006
+Wed Feb 22 03:29:37 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -479,14 +479,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
-Sat Feb 18 03:38:13 UTC 2006
+Wed Feb 22 03:29:42 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-b: b
-dsh: Process terminated (before write).
 c: c
+dsh: Process terminated (before write).
+b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -592,7 +592,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Feb 18 12:38:15 JST 2006
-pbuilder-time-stamp: 1140233895
+Current time: Wed Feb 22 12:29:45 JST 2006
+pbuilder-time-stamp: 1140578985
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/31813 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/16713 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
index 306548a..576f754 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
@@ -2,14 +2,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Feb 18 12:30:01 JST 2006
-pbuilder-time-stamp: 1140233401
+Current time: Wed Feb 22 12:23:14 JST 2006
+pbuilder-time-stamp: 1140578594
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/7347/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/24533/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -40,7 +40,7 @@ WARNING: The following packages cannot be authenticated!
   gettext-base libmagic1 file debconf-utils html2text gettext intltool-debian
   po-debconf debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package gettext-base.
-(Reading database ... 11017 files and directories currently installed.)
+(Reading database ... 11052 files and directories currently installed.)
 Unpacking gettext-base (from .../gettext-base_0.14.5-2_amd64.deb) ...
 Selecting previously deselected package libmagic1.
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
@@ -90,17 +90,17 @@ After unpacking 406kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 11687 files and directories currently installed.)
+(Reading database ... 11722 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.7_amd64.deb) ...
 Setting up fakeroot (1.5.7) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/7347/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/7347/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/24533/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/24533/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -410,8 +410,8 @@ success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
-c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+c: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -419,11 +419,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
-Sat Feb 18 03:31:01 UTC 2006
+Wed Feb 22 03:23:57 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -493,13 +493,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
-Sat Feb 18 03:31:06 UTC 2006
+Wed Feb 22 03:24:02 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-b: b
 dsh: Process terminated (before write).
+b: b
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -623,7 +623,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Feb 18 12:31:10 JST 2006
-pbuilder-time-stamp: 1140233470
+Current time: Wed Feb 22 12:24:05 JST 2006
+pbuilder-time-stamp: 1140578645
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/7347 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/24533 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-etch.log b/testsuite/cdebootstrap/pbuilder-create-etch.log
index 1b3ac8a..baa426d 100644
--- a/testsuite/cdebootstrap/pbuilder-create-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-create-etch.log
@@ -182,6 +182,8 @@ P: Retrieving base-passwd
 P: Validating base-passwd
 P: Retrieving logrotate
 P: Validating logrotate
+P: Retrieving procps
+P: Validating procps
 P: Retrieving hostname
 P: Validating hostname
 P: Retrieving libuuid1
@@ -210,6 +212,8 @@ P: Retrieving diff
 P: Validating diff
 P: Retrieving libblkid1
 P: Validating libblkid1
+P: Retrieving mount
+P: Validating mount
 P: Retrieving e2fsprogs
 P: Validating e2fsprogs
 P: Retrieving initscripts
@@ -220,8 +224,6 @@ P: Retrieving sysvinit
 P: Validating sysvinit
 P: Retrieving base-files
 P: Validating base-files
-P: Retrieving mount
-P: Validating mount
 P: Retrieving bash
 P: Validating bash
 P: Retrieving findutils
@@ -262,6 +264,7 @@ P: Extracting passwd
 P: Extracting libslang2
 P: Extracting libnewt0.51
 P: Extracting base-passwd
+P: Extracting procps
 P: Extracting hostname
 P: Extracting libuuid1
 P: Extracting util-linux
@@ -276,12 +279,12 @@ P: Extracting libss2
 P: Extracting dselect
 P: Extracting diff
 P: Extracting libblkid1
+P: Extracting mount
 P: Extracting e2fsprogs
 P: Extracting initscripts
 P: Extracting sysv-rc
 P: Extracting sysvinit
 P: Extracting base-files
-P: Extracting mount
 P: Extracting bash
 P: Extracting findutils
 P: Extracting makedev
@@ -444,22 +447,22 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking bsdutils (from .../bsdutils_2.12r-6_amd64.deb) ...
 P: Unpacking package bsdutils
 O: Selecting previously deselected package libpam-runtime.
-O: Unpacking libpam-runtime (from .../libpam-runtime_0.79-3_all.deb) ...
+O: Unpacking libpam-runtime (from .../libpam-runtime_0.79-3.1_all.deb) ...
 P: Unpacking package libpam-runtime
 O: Selecting previously deselected package libpam0g.
-O: Unpacking libpam0g (from .../libpam0g_0.79-3_amd64.deb) ...
+O: Unpacking libpam0g (from .../libpam0g_0.79-3.1_amd64.deb) ...
 P: Unpacking package libpam0g
 O: Selecting previously deselected package libsepol1.
 O: Unpacking libsepol1 (from .../libsepol1_1.10-2_amd64.deb) ...
 P: Unpacking package libsepol1
 O: Selecting previously deselected package libselinux1.
-O: Unpacking libselinux1 (from .../libselinux1_1.28-2_amd64.deb) ...
+O: Unpacking libselinux1 (from .../libselinux1_1.28-4_amd64.deb) ...
 P: Unpacking package libselinux1
 O: Selecting previously deselected package libcap1.
 O: Unpacking libcap1 (from .../libcap1_1.10-14_amd64.deb) ...
 P: Unpacking package libcap1
 O: Selecting previously deselected package libpam-modules.
-O: Unpacking libpam-modules (from .../libpam-modules_0.79-3_amd64.deb) ...
+O: Unpacking libpam-modules (from .../libpam-modules_0.79-3.1_amd64.deb) ...
 P: Unpacking package libpam-modules
 O: Selecting previously deselected package login.
 O: dpkg: regarding .../login_4.0.14-4_amd64.deb containing login, pre-dependency problem:
@@ -485,6 +488,9 @@ P: Unpacking package libslang2
 O: Selecting previously deselected package libnewt0.51.
 O: Unpacking libnewt0.51 (from .../libnewt0.51_0.51.6-31_amd64.deb) ...
 P: Unpacking package libnewt0.51
+O: Selecting previously deselected package procps.
+O: Unpacking procps (from .../procps_3.2.5-1_amd64.deb) ...
+P: Unpacking package procps
 O: Selecting previously deselected package hostname.
 O: dpkg: regarding .../hostname_2.91_amd64.deb containing hostname, pre-dependency problem:
 O:  hostname pre-depends on libc6 (>= 2.3.5-1)
@@ -571,6 +577,21 @@ P: Unpacking package diff
 O: Selecting previously deselected package libblkid1.
 O: Unpacking libblkid1 (from .../libblkid1_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 P: Unpacking package libblkid1
+O: Selecting previously deselected package mount.
+O: dpkg: regarding .../mount_2.12r-6_amd64.deb containing mount, pre-dependency problem:
+O:  mount pre-depends on libblkid1 (>= 1.37-1)
+O:   libblkid1 is unpacked, but has never been configured.
+O: dpkg: warning - ignoring pre-dependency problem !
+O: dpkg: regarding .../mount_2.12r-6_amd64.deb containing mount, pre-dependency problem:
+O:  mount 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: dpkg: regarding .../mount_2.12r-6_amd64.deb containing mount, pre-dependency problem:
+O:  mount pre-depends on libuuid1
+O:   libuuid1 is unpacked, but has never been configured.
+O: dpkg: warning - ignoring pre-dependency problem !
+O: Unpacking mount (from .../mount_2.12r-6_amd64.deb) ...
+P: Unpacking package mount
 O: Selecting previously deselected package e2fsprogs.
 O: dpkg: regarding .../e2fsprogs_1.38+1.39-WIP-2005.12.31-1_amd64.deb containing e2fsprogs, pre-dependency problem:
 O:  e2fsprogs pre-depends on e2fslibs (= 1.38+1.39-WIP-2005.12.31-1)
@@ -599,52 +620,25 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking e2fsprogs (from .../e2fsprogs_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 P: Unpacking package e2fsprogs
 O: Selecting previously deselected package initscripts.
-O: Unpacking initscripts (from .../initscripts_2.86.ds1-4_amd64.deb) ...
+O: Unpacking initscripts (from .../initscripts_2.86.ds1-12_amd64.deb) ...
 P: Unpacking package initscripts
 O: Selecting previously deselected package sysv-rc.
-O: Unpacking sysv-rc (from .../sysv-rc_2.86.ds1-4_all.deb) ...
+O: Unpacking sysv-rc (from .../sysv-rc_2.86.ds1-12_all.deb) ...
 P: Unpacking package sysv-rc
 O: Selecting previously deselected package sysvinit.
-O: dpkg: regarding .../sysvinit_2.86.ds1-4_amd64.deb containing sysvinit, pre-dependency problem:
-O:  sysvinit 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: dpkg: regarding .../sysvinit_2.86.ds1-4_amd64.deb containing sysvinit, pre-dependency problem:
-O:  sysvinit pre-depends on libselinux1 (>= 1.26)
-O:   libselinux1 is unpacked, but has never been configured.
-O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../sysvinit_2.86.ds1-4_amd64.deb containing sysvinit, pre-dependency problem:
-O:  sysvinit pre-depends on libsepol1 (>= 1.8)
-O:   libsepol1 is unpacked, but has never been configured.
-O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../sysvinit_2.86.ds1-4_amd64.deb containing sysvinit, pre-dependency problem:
+O: dpkg: regarding .../sysvinit_2.86.ds1-12_amd64.deb containing sysvinit, pre-dependency problem:
 O:  sysvinit pre-depends on initscripts
 O:   initscripts is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../sysvinit_2.86.ds1-4_amd64.deb containing sysvinit, pre-dependency problem:
-O:  sysvinit pre-depends on sysv-rc (>= 2.85-2) | file-rc (>> 0.7.0)
+O: dpkg: regarding .../sysvinit_2.86.ds1-12_amd64.deb containing sysvinit, pre-dependency problem:
+O:  sysvinit pre-depends on sysv-rc (>= 2.86.ds1-1.2) | file-rc (>> 0.7.0)
 O:   sysv-rc is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking sysvinit (from .../sysvinit_2.86.ds1-4_amd64.deb) ...
+O: Unpacking sysvinit (from .../sysvinit_2.86.ds1-12_amd64.deb) ...
 P: Unpacking package sysvinit
 O: Selecting previously deselected package base-files.
 O: Unpacking base-files (from .../base-files_3.1.10_amd64.deb) ...
 P: Unpacking package base-files
-O: Selecting previously deselected package mount.
-O: dpkg: regarding .../mount_2.12r-6_amd64.deb containing mount, pre-dependency problem:
-O:  mount pre-depends on libblkid1 (>= 1.37-1)
-O:   libblkid1 is unpacked, but has never been configured.
-O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../mount_2.12r-6_amd64.deb containing mount, pre-dependency problem:
-O:  mount 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: dpkg: regarding .../mount_2.12r-6_amd64.deb containing mount, pre-dependency problem:
-O:  mount pre-depends on libuuid1
-O:   libuuid1 is unpacked, but has never been configured.
-O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking mount (from .../mount_2.12r-6_amd64.deb) ...
-P: Unpacking package mount
 O: Selecting previously deselected package bash.
 O: dpkg: regarding .../bootstrap/bash_3.1-2_amd64.deb containing bash, pre-dependency problem:
 O:  bash pre-depends on libc6 (>= 2.3.5-1)
@@ -669,12 +663,12 @@ P: Unpacking package makedev
 O: Setting up makedev (2.3.1-80) ...
 P: Configuring package makedev
 O: 
-O: Setting up sysv-rc (2.86.ds1-4) ...
+O: Setting up sysv-rc (2.86.ds1-12) ...
 P: Configuring package sysv-rc
 O: 
 O: Setting up gcc-4.0-base (4.0.2-8) ...
 P: Configuring package gcc-4.0-base
-O: Setting up libpam-runtime (0.79-3) ...
+O: Setting up libpam-runtime (0.79-3.1) ...
 P: Configuring package libpam-runtime
 O: 
 O: Setting up libc6 (2.3.5-13) ...
@@ -687,7 +681,7 @@ O:
 O: Setting up libuuid1 (1.38+1.39-WIP-2005.12.31-1) ...
 P: Configuring package libuuid1
 O: 
-O: Setting up libpam0g (0.79-3) ...
+O: Setting up libpam0g (0.79-3.1) ...
 P: Configuring package libpam0g
 O: 
 O: Setting up bsdutils (2.12r-6) ...
@@ -756,7 +750,7 @@ O: Setting up liblocale-gettext-perl (1.05-1) ...
 P: Configuring package liblocale-gettext-perl
 O: Setting up diff (2.8.1-11) ...
 P: Configuring package diff
-O: Setting up libselinux1 (1.28-2) ...
+O: Setting up libselinux1 (1.28-4) ...
 P: Configuring package libselinux1
 O: 
 O: Setting up libstdc++6 (4.0.2-8) ...
@@ -772,11 +766,14 @@ O:
 O: Setting up debianutils (2.15.2) ...
 P: Configuring package debianutils
 O: 
+O: Setting up procps (3.2.5-1) ...
+P: Configuring package procps
+O: 
 O: Setting up ncurses-base (5.5-1) ...
 P: Configuring package ncurses-base
 O: Setting up ncurses-bin (5.5-1) ...
 P: Configuring package ncurses-bin
-O: Setting up libpam-modules (0.79-3) ...
+O: Setting up libpam-modules (0.79-3.1) ...
 P: Configuring package libpam-modules
 O: 
 O: Setting up base-files (3.1.10) ...
@@ -804,13 +801,13 @@ P: Configuring package lsb-base
 O: Setting up passwd (4.0.14-4) ...
 P: Configuring package passwd
 O: 
+O: Setting up initscripts (2.86.ds1-12) ...
+P: Configuring package initscripts
+O: 
 O: Setting up util-linux (2.12r-6) ...
 P: Configuring package util-linux
 O: 
-O: Setting up initscripts (2.86.ds1-4) ...
-P: Configuring package initscripts
-O: 
-O: Setting up sysvinit (2.86.ds1-4) ...
+O: Setting up sysvinit (2.86.ds1-12) ...
 P: Configuring package sysvinit
 O: sysvinit: creating /dev/initctl
 O: init: 
@@ -823,7 +820,7 @@ P: Configuring package debconf
 O: 
 O: Selecting previously deselected package apt.
 O: (Reading database ... 
-O: 4570 files and directories currently installed.)
+O: 4645 files and directories currently installed.)
 O: Unpacking apt (from .../apt_0.6.43.2_amd64.deb) ...
 P: Unpacking package apt
 O: Setting up apt (0.6.43.2) ...
@@ -832,13 +829,13 @@ O:
 P: Configuring helper cdebootstrap-helper-apt
 O: Selecting previously deselected package cdebootstrap-helper-apt.
 O: (Reading database ... 
-O: 4740 files and directories currently installed.)
+O: 4815 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 [5902B]
 O: Ign bootstrap: . Release
-O: Fetched 6091B in 0s (55.0kB/s)
+O: Fetched 6091B in 0s (54.9kB/s)
 O: Reading package lists...
 O: 
 O: W: 
@@ -880,7 +877,7 @@ O:   exim4-daemon-light at exim4 telnet dhcp3-common dhcp3-client psmisc
 O: Authentication warning overridden.
 O: Selecting previously deselected package adduser.
 O: (Reading database ... 
-O: 4741 files and directories currently installed.)
+O: 4816 files and directories currently installed.)
 O: Unpacking adduser (from .../bootstrap/adduser_3.80_all.deb) ...
 P: Unpacking package adduser
 O: Selecting previously deselected package apt-utils.
@@ -977,10 +974,10 @@ O: Selecting previously deselected package manpages.
 O: Unpacking manpages (from .../manpages_2.17-1_all.deb) ...
 P: Unpacking package manpages
 O: Selecting previously deselected package nano.
-O: Unpacking nano (from .../nano_1.3.10-1_amd64.deb) ...
+O: Unpacking nano (from .../nano_1.3.10-2_amd64.deb) ...
 P: Unpacking package nano
 O: Selecting previously deselected package netkit-inetd.
-O: Unpacking netkit-inetd (from .../netkit-inetd_0.10-10.2_amd64.deb) ...
+O: Unpacking netkit-inetd (from .../netkit-inetd_0.10-10.3_amd64.deb) ...
 P: Unpacking package netkit-inetd
 O: Selecting previously deselected package tcpd.
 O: Unpacking tcpd (from .../tcpd_7.6.dbs-8_amd64.deb) ...
@@ -1128,14 +1125,11 @@ O: Building database of manual pages ...
 O: 
 O: Setting up manpages (2.17-1) ...
 P: Configuring package manpages
-O: Setting up nano (1.3.10-1) ...
+O: Setting up nano (1.3.10-2) ...
 P: Configuring package nano
 O: 
-O: Setting up netkit-inetd (0.10-10.2) ...
+O: Setting up netkit-inetd (0.10-10.3) ...
 P: Configuring package netkit-inetd
-O: Starting internet superserver:
-O:  inetd
-O: .
 O: 
 O: Setting up tcpd (7.6.dbs-8) ...
 P: Configuring package tcpd
@@ -1205,18 +1199,18 @@ O: .
 O: 
 P: Deconfiguring helper cdebootstrap-helper-apt
 O: (Reading database ... 
-O: 6608 files and directories currently installed.)
+O: 6683 files and directories currently installed.)
 O: Removing cdebootstrap-helper-apt ...
 P: Deconfiguring helper cdebootstrap-helper-diverts
 O: (Reading database ... 
-O: 6607 files and directories currently installed.)
+O: 6682 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: 6605 files and directories currently installed.)
+O: 6680 files and directories currently installed.)
 O: Removing cdebootstrap-helper-makedev ...
 O: Reading package lists...
 O: 
@@ -1229,18 +1223,18 @@ 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//28364/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//13137/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//28364/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//13137/etc/mtab' to `../proc/mounts': File exists
  -> 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 [5902B]
 Ign http://ftp.jp.debian.org etch Release
-Get:3 http://ftp.jp.debian.org etch/main Packages [3640kB]
-Fetched 3646kB in 1s (2082kB/s)
+Get:3 http://ftp.jp.debian.org etch/main Packages [3650kB]
+Fetched 3656kB in 1s (2023kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org etch Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: You may want to run apt-get update to correct these problems
@@ -1274,7 +1268,7 @@ WARNING: The following packages cannot be authenticated!
   linux-kernel-headers libc6-dev libstdc++6-4.0-dev g++-4.0 g++
   build-essential
 Selecting previously deselected package binutils.
-(Reading database ... 6605 files and directories currently installed.)
+(Reading database ... 6680 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.16.1cvs20060117-1_amd64.deb) ...
 Selecting previously deselected package cpp-4.0.
 Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-8_amd64.deb) ...
@@ -1335,9 +1329,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: 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//28364/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//13137/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//28364 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//13137 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-sarge.log b/testsuite/cdebootstrap/pbuilder-create-sarge.log
index 2044118..fbf80a7 100644
--- a/testsuite/cdebootstrap/pbuilder-create-sarge.log
+++ b/testsuite/cdebootstrap/pbuilder-create-sarge.log
@@ -759,8 +759,7 @@ O: Architecture-specific modutils configuration not found, using defaults
 O: 
 P: Configuring helper cdebootstrap-helper-apt
 O: Selecting previously deselected package cdebootstrap-helper-apt.
-O: (Reading database ... 
-O: 4193 files and directories currently installed.)
+O: (Reading database ... 4193 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-apt (from /cdebootstrap-helper-apt.deb) ...
 O: Setting up cdebootstrap-helper-apt (1) ...
 P: Configuring helper cdebootstrap-helper-diverts
@@ -779,7 +778,8 @@ O: Unpacking cdebootstrap-helper-makedev (from .../cdebootstrap-helper-makedev.d
 O: Setting up cdebootstrap-helper-makedev (1) ...
 O: 
 O: Selecting previously deselected package apt.
-O: (Reading database ... 4198 files and directories currently installed.)
+O: (Reading database ... 
+O: 4198 files and directories currently installed.)
 O: Unpacking apt (from .../apt_0.5.28.6_amd64.deb) ...
 P: Unpacking package apt
 O: Setting up apt (0.5.28.6) ...
@@ -788,6 +788,7 @@ O:
 O: Reading Package Lists...
 O: 
 O: Reading Package Lists...
+O: 
 O: Building Dependency Tree...
 O: 
 O: Suggested packages:
@@ -1216,16 +1217,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//29015/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//13913/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//29015/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//13913/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> installing dummy policy-rc.d
 Get:1 http://ftp.jp.debian.org sarge/main Packages [3223kB]
 Get:2 http://ftp.jp.debian.org sarge/main Release [110B]
-Fetched 3223kB in 1s (2108kB/s)
+Fetched 3223kB in 1s (2032kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -1312,9 +1313,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] [pid | job]... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//29015/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//13913/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//29015 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//13913 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-sid.log b/testsuite/cdebootstrap/pbuilder-create-sid.log
index 62d944f..763f694 100644
--- a/testsuite/cdebootstrap/pbuilder-create-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-create-sid.log
@@ -300,7 +300,8 @@ P: Configuring package base-passwd
 O: 
 P: Configuring helper cdebootstrap-helper-diverts
 O: Selecting previously deselected package cdebootstrap-helper-diverts.
-O: (Reading database ... 24 files and directories currently installed.)
+O: (Reading database ... 
+O: 24 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-diverts (from .../cdebootstrap-helper-diverts.deb) ...
 O: Adding `diversion of /sbin/start-stop-daemon to /sbin/start-stop-daemon.REAL by cdebootstrap-helper-diverts'
 O: Adding `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by cdebootstrap-helper-diverts'
@@ -313,12 +314,12 @@ O: Unpacking cdebootstrap-helper-makedev (from .../cdebootstrap-helper-makedev.d
 O: Setting up cdebootstrap-helper-makedev (1) ...
 O: 
 O: Selecting previously deselected package dpkg.
-O: dpkg: regarding .../dpkg_1.13.15_amd64.deb containing dpkg, pre-dependency problem:
+O: dpkg: regarding .../dpkg_1.13.16_amd64.deb containing dpkg, pre-dependency problem:
 O:  dpkg pre-depends on libc6 (>= 2.3.5-1)
 O: dpkg: warning - ignoring pre-dependency problem !
 O: (Reading database ... 
 O: 29 files and directories currently installed.)
-O: Unpacking dpkg (from .../dpkg_1.13.15_amd64.deb) ...
+O: Unpacking dpkg (from .../dpkg_1.13.16_amd64.deb) ...
 P: Unpacking package dpkg
 O: dpkg: dpkg: dependency problems, but configuring anyway as you request:
 O:  dpkg depends on libc6 (>= 2.3.5-1); however:
@@ -326,12 +327,12 @@ O:   Package libc6 is not installed.
 O:  dpkg depends on coreutils | textutils (>= 2.0-3); however:
 O:   Package coreutils is not installed.
 O:   Package textutils is not installed.
-O: Setting up dpkg (1.13.15) ...
+O: Setting up dpkg (1.13.16) ...
 P: Configuring package dpkg
 O: 
 O: Selecting previously deselected package libc6.
 O: (Reading database ... 
-O: 189 files and directories currently installed.)
+O: 191 files and directories currently installed.)
 O: Unpacking libc6 (from .../libc6_2.3.6-1_amd64.deb) ...
 P: Unpacking package libc6
 O: Selecting previously deselected package gcc-4.0-base.
@@ -570,7 +571,7 @@ O: Selecting previously deselected package libss2.
 O: Unpacking libss2 (from .../libss2_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 P: Unpacking package libss2
 O: Selecting previously deselected package dselect.
-O: Unpacking dselect (from .../dselect_1.13.15_amd64.deb) ...
+O: Unpacking dselect (from .../dselect_1.13.16_amd64.deb) ...
 P: Unpacking package dselect
 O: Selecting previously deselected package diff.
 O: dpkg: regarding .../diff_2.8.1-11_amd64.deb containing diff, pre-dependency problem:
@@ -793,7 +794,7 @@ O:
 O: Setting up gzip (1.3.5-12) ...
 P: Configuring package gzip
 O: 
-O: Setting up dselect (1.13.15) ...
+O: Setting up dselect (1.13.16) ...
 P: Configuring package dselect
 O: Setting up bash (3.1-2) ...
 P: Configuring package bash
@@ -825,7 +826,7 @@ P: Configuring package debconf
 O: 
 O: Selecting previously deselected package apt.
 O: (Reading database ... 
-O: 4596 files and directories currently installed.)
+O: 4626 files and directories currently installed.)
 O: Unpacking apt (from .../apt_0.6.43.2_amd64.deb) ...
 P: Unpacking package apt
 O: Setting up apt (0.6.43.2) ...
@@ -834,13 +835,13 @@ O:
 P: Configuring helper cdebootstrap-helper-apt
 O: Selecting previously deselected package cdebootstrap-helper-apt.
 O: (Reading database ... 
-O: 4766 files and directories currently installed.)
+O: 4796 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 [5722B]
 O: Ign bootstrap: . Release
-O: Fetched 5911B in 0s (48.9kB/s)
+O: Fetched 5911B in 0s (49.3kB/s)
 O: Reading package lists...
 O: 
 O: W: 
@@ -882,8 +883,8 @@ O:   exim4-daemon-light at exim4 telnet dhcp3-common dhcp3-client psmisc
 O: Authentication warning overridden.
 O: Selecting previously deselected package adduser.
 O: (Reading database ... 
-O: 4767 files and directories currently installed.)
-O: Unpacking adduser (from .../bootstrap/adduser_3.83_all.deb) ...
+O: 4797 files and directories currently installed.)
+O: Unpacking adduser (from .../bootstrap/adduser_3.84_all.deb) ...
 P: Unpacking package adduser
 O: Selecting previously deselected package apt-utils.
 O: Unpacking apt-utils (from .../apt-utils_0.6.43.2_amd64.deb) ...
@@ -1038,7 +1039,7 @@ P: Unpacking package dhcp3-client
 O: Selecting previously deselected package psmisc.
 O: Unpacking psmisc (from .../psmisc_22.1-1_amd64.deb) ...
 P: Unpacking package psmisc
-O: Setting up adduser (3.83) ...
+O: Setting up adduser (3.84) ...
 P: Configuring package adduser
 O: 
 O: Setting up apt-utils (0.6.43.2) ...
@@ -1164,7 +1165,6 @@ O: hostname:
 O: Host name lookup failure
 O: 
 O: Adding system-user for exim (v4)
-O: Use of uninitialized value in printf at /usr/sbin/adduser line 334.
 O: chage: the shadow password file is not present
 O: 
 O: Setting up exim4-base (4.60-3) ...
@@ -1205,18 +1205,18 @@ O: .
 O: 
 P: Deconfiguring helper cdebootstrap-helper-apt
 O: (Reading database ... 
-O: 6635 files and directories currently installed.)
+O: 6670 files and directories currently installed.)
 O: Removing cdebootstrap-helper-apt ...
 P: Deconfiguring helper cdebootstrap-helper-diverts
 O: (Reading database ... 
-O: 6634 files and directories currently installed.)
+O: 6669 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: 6632 files and directories currently installed.)
+O: 6667 files and directories currently installed.)
 O: Removing cdebootstrap-helper-makedev ...
 O: Reading package lists...
 O: 
@@ -1229,18 +1229,18 @@ 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//2055/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//19470/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//2055/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//19470/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> 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 [5722B]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [3926kB]
-Fetched 3932kB in 2s (1539kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [3933kB]
+Fetched 3939kB in 1s (1979kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: You may want to run apt-get update to correct these problems
@@ -1274,7 +1274,7 @@ WARNING: The following packages cannot be authenticated!
   gcc linux-kernel-headers libc6-dev libstdc++6-4.0-dev g++-4.0 g++
   build-essential
 Selecting previously deselected package binutils.
-(Reading database ... 6632 files and directories currently installed.)
+(Reading database ... 6667 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.16.1cvs20060117-1_amd64.deb) ...
 Selecting previously deselected package cpp-4.0.
 Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-9_amd64.deb) ...
@@ -1283,7 +1283,7 @@ Unpacking cpp (from .../cpp_4%3a4.0.2-2_amd64.deb) ...
 Selecting previously deselected package perl-modules.
 Unpacking perl-modules (from .../perl-modules_5.8.8-2_all.deb) ...
 Selecting previously deselected package libdb4.4.
-Unpacking libdb4.4 (from .../libdb4.4_4.4.20-1_amd64.deb) ...
+Unpacking libdb4.4 (from .../libdb4.4_4.4.20-2_amd64.deb) ...
 Selecting previously deselected package perl.
 Unpacking perl (from .../perl_5.8.8-2_amd64.deb) ...
 Selecting previously deselected package patch.
@@ -1291,7 +1291,7 @@ Unpacking patch (from .../patch_2.5.9-4_amd64.deb) ...
 Selecting previously deselected package make.
 Unpacking make (from .../make_3.80+3.81.b4-1_amd64.deb) ...
 Selecting previously deselected package dpkg-dev.
-Unpacking dpkg-dev (from .../dpkg-dev_1.13.15_all.deb) ...
+Unpacking dpkg-dev (from .../dpkg-dev_1.13.16_all.deb) ...
 Selecting previously deselected package gcc-4.0.
 Unpacking gcc-4.0 (from .../gcc-4.0_4.0.2-9_amd64.deb) ...
 Selecting previously deselected package gcc.
@@ -1313,7 +1313,7 @@ Setting up binutils (2.16.1cvs20060117-1) ...
 Setting up cpp-4.0 (4.0.2-9) ...
 Setting up cpp (4.0.2-2) ...
 
-Setting up libdb4.4 (4.4.20-1) ...
+Setting up libdb4.4 (4.4.20-2) ...
 Setting up patch (2.5.9-4) ...
 Setting up make (3.80+3.81.b4-1) ...
 
@@ -1326,7 +1326,7 @@ Setting up perl-modules (5.8.8-2) ...
 Setting up libstdc++6-4.0-dev (4.0.2-9) ...
 Setting up perl (5.8.8-2) ...
 
-Setting up dpkg-dev (1.13.15) ...
+Setting up dpkg-dev (1.13.16) ...
 Setting up g++-4.0 (4.0.2-9) ...
 Setting up g++ (4.0.2-2) ...
 
@@ -1338,9 +1338,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: 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//2055/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//19470/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//2055 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//19470 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-etch.log b/testsuite/cdebootstrap/pbuilder-execute-etch.log
index db0aa4a..0781864 100644
--- a/testsuite/cdebootstrap/pbuilder-execute-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-execute-etch.log
@@ -1,9 +1,9 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//21798/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//6603/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
@@ -13,4 +13,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//21798 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//6603 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-sarge.log b/testsuite/cdebootstrap/pbuilder-execute-sarge.log
index 7e2a83f..e653820 100644
--- a/testsuite/cdebootstrap/pbuilder-execute-sarge.log
+++ b/testsuite/cdebootstrap/pbuilder-execute-sarge.log
@@ -1,9 +1,9 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//20122/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//5053/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
@@ -13,4 +13,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//20122 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//5053 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-sid.log b/testsuite/cdebootstrap/pbuilder-execute-sid.log
index 13c3133..9d214a1 100644
--- a/testsuite/cdebootstrap/pbuilder-execute-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-execute-sid.log
@@ -1,9 +1,9 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//28061/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//12945/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
@@ -13,4 +13,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//28061 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//12945 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
index 1f30af1..ce78108 100644
--- a/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
+++ b/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//24557/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//9147/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -18,9 +18,9 @@ Get:3 http://ftp.jp.debian.org experimental Release [4245B]
 Ign http://ftp.jp.debian.org experimental Release
 Get:4 http://ftp.jp.debian.org sid Release [5722B]
 Ign http://ftp.jp.debian.org sid Release
-Get:5 http://ftp.jp.debian.org experimental/main Packages [126kB]
+Get:5 http://ftp.jp.debian.org experimental/main Packages [117kB]
 Hit http://ftp.jp.debian.org sid/main Packages
-Fetched 136kB in 0s (332kB/s)
+Fetched 127kB in 0s (376kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org experimental Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
@@ -42,31 +42,31 @@ Need to get 0B/3537kB of archives.
 After unpacking 557kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   whiptail libnewt0.52 diff gcc-4.1-base libgcc1 libstdc++6 aptitude
-(Reading database ... 10968 files and directories currently installed.)
+(Reading database ... 11052 files and directories currently installed.)
 Preparing to replace whiptail 0.51.6-31 (using .../whiptail_0.52.2-1_amd64.deb) ...
 Unpacking replacement whiptail ...
-(Reading database ... 10967 files and directories currently installed.)
+(Reading database ... 11051 files and directories currently installed.)
 Removing libnewt0.51 ...
 Selecting previously deselected package libnewt0.52.
-(Reading database ... 10902 files and directories currently installed.)
+(Reading database ... 10986 files and directories currently installed.)
 Unpacking libnewt0.52 (from .../libnewt0.52_0.52.2-1_amd64.deb) ...
 Preparing to replace diff 2.8.1-11 (using .../diff_2.8.7-0.2_amd64.deb) ...
 Unpacking replacement diff ...
 Setting up diff (2.8.7-0.2) ...
 Selecting previously deselected package gcc-4.1-base.
-(Reading database ... 10974 files and directories currently installed.)
+(Reading database ... 11058 files and directories currently installed.)
 Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1-0exp7_amd64.deb) ...
 Preparing to replace libgcc1 1:4.0.2-9 (using .../libgcc1_1%3a4.1-0exp7_amd64.deb) ...
 Unpacking replacement libgcc1 ...
 Setting up gcc-4.1-base (4.1-0exp7) ...
 Setting up libgcc1 (4.1-0exp7) ...
 
-(Reading database ... 10980 files and directories currently installed.)
+(Reading database ... 11064 files and directories currently installed.)
 Preparing to replace libstdc++6 4.0.2-9 (using .../libstdc++6_4.1-0exp7_amd64.deb) ...
 Unpacking replacement libstdc++6 ...
 Setting up libstdc++6 (4.1-0exp7) ...
 
-(Reading database ... 10980 files and directories currently installed.)
+(Reading database ... 11064 files and directories currently installed.)
 Preparing to replace aptitude 0.4.1-1 (using .../aptitude_0.4.1-1experimental1_amd64.deb) ...
 Unpacking replacement aptitude ...
 Setting up libnewt0.52 (0.52.2-1) ...
@@ -93,10 +93,10 @@ Need to get 0B/1501kB of archives.
 After unpacking 9462kB disk space will be freed.
 WARNING: The following packages cannot be authenticated!
   apt-utils apt
-(Reading database ... 10980 files and directories currently installed.)
+(Reading database ... 11064 files and directories currently installed.)
 Removing tasksel ...
 Removing aptitude ...
-(Reading database ... 10788 files and directories currently installed.)
+(Reading database ... 10872 files and directories currently installed.)
 Preparing to replace apt-utils 0.6.43.2 (using .../apt-utils_0.6.43.2exp1_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Preparing to replace apt 0.6.43.2 (using .../apt_0.6.43.2exp1_amd64.deb) ...
@@ -112,9 +112,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: 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//24557/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//9147/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//24557 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//9147 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
index 4179d37..7ea571a 100644
--- a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//22779/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//7570/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -13,8 +13,8 @@ Refreshing the base.tgz
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org sid Release [5722B]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [3926kB]
-Fetched 3932kB in 2s (1358kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [3933kB]
+Fetched 3939kB in 2s (1705kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: You may want to run apt-get update to correct these problems
@@ -26,114 +26,60 @@ The following NEW packages will be installed:
   libdb4.4
 The following packages will be upgraded:
   adduser coreutils cpp-4.0 dmidecode dpkg dpkg-dev dselect g++-4.0 gcc-4.0
-  gcc-4.0-base initscripts klogd libc6 libc6-dev libgcc1 libpam-modules
-  libpam-runtime libpam0g libselinux1 libstdc++6 libstdc++6-4.0-dev login nano
-  netkit-inetd passwd perl perl-base perl-modules sed sysklogd sysv-rc
-  sysvinit
-32 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/30.3MB of archives.
-After unpacking 1888kB of additional disk space will be used.
+  gcc-4.0-base klogd libc6 libc6-dev libgcc1 libstdc++6 libstdc++6-4.0-dev
+  login passwd perl perl-base perl-modules procps sed sysklogd
+24 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Need to get 0B/29.4MB of archives.
+After unpacking 1942kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
-  dpkg coreutils libc6-dev libc6 libpam-runtime libpam0g libselinux1
-  libpam-modules login perl-modules libdb4.4 perl-base perl sed sysvinit
-  initscripts cpp-4.0 gcc-4.0-base libgcc1 gcc-4.0 g++-4.0 libstdc++6-4.0-dev
-  libstdc++6 sysv-rc passwd adduser dmidecode sysklogd klogd nano netkit-inetd
-  dselect dpkg-dev
-(Reading database ... 10991 files and directories currently installed.)
-Preparing to replace dpkg 1.13.13 (using .../dpkg_1.13.15_amd64.deb) ...
+  dpkg coreutils login perl-modules libc6-dev libc6 libdb4.4 perl-base perl
+  sed cpp-4.0 gcc-4.0-base libgcc1 gcc-4.0 g++-4.0 libstdc++6-4.0-dev
+  libstdc++6 passwd adduser dmidecode sysklogd klogd dselect procps dpkg-dev
+(Reading database ... 11066 files and directories currently installed.)
+Preparing to replace dpkg 1.13.13 (using .../dpkg_1.13.16_amd64.deb) ...
 Unpacking replacement dpkg ...
-Setting up dpkg (1.13.15) ...
+Setting up dpkg (1.13.16) ...
 
-(Reading database ... 10966 files and directories currently installed.)
+(Reading database ... 11042 files and directories currently installed.)
 Preparing to replace coreutils 5.2.1-2.1 (using .../coreutils_5.93-5_amd64.deb) ...
 Removing `local diversion of /usr/share/man/man1/md5sum.textutils.1.gz to /usr/share/man/man1/md5sum.1.gz'
 Removing `local diversion of /usr/bin/md5sum.textutils to /usr/bin/md5sum'
 Unpacking replacement coreutils ...
 Setting up coreutils (5.93-5) ...
 
-(Reading database ... 10980 files and directories currently installed.)
+(Reading database ... 11056 files and directories currently installed.)
+Preparing to replace login 1:4.0.14-4 (using .../login_1%3a4.0.14-6_amd64.deb) ...
+Unpacking replacement login ...
+Setting up login (4.0.14-6) ...
+Installing new version of config file /etc/login.defs ...
+
+(Reading database ... 11056 files and directories currently installed.)
+Preparing to replace perl-modules 5.8.7-10 (using .../perl-modules_5.8.8-2_all.deb) ...
+Unpacking replacement perl-modules ...
 Preparing to replace libc6-dev 2.3.5-13 (using .../libc6-dev_2.3.6-1_amd64.deb) ...
 Unpacking replacement libc6-dev ...
 Preparing to replace libc6 2.3.5-13 (using .../libc6_2.3.6-1_amd64.deb) ...
 Unpacking replacement libc6 ...
 Setting up libc6 (2.3.6-1) ...
 Current default timezone: 'UTC'.
-Local time is now:      Sat Feb 18 03:53:48 UTC 2006.
-Universal Time is now:  Sat Feb 18 03:53:48 UTC 2006.
+Local time is now:      Wed Feb 22 03:42:36 UTC 2006.
+Universal Time is now:  Wed Feb 22 03:42:36 UTC 2006.
 Run 'tzconfig' if you wish to change it.
 
-(Reading database ... 10953 files and directories currently installed.)
-Preparing to replace libpam-runtime 0.79-3 (using .../libpam-runtime_0.79-3.1_all.deb) ...
-Unpacking replacement libpam-runtime ...
-Setting up libpam-runtime (0.79-3.1) ...
-
-(Reading database ... 10953 files and directories currently installed.)
-Preparing to replace libpam0g 0.79-3 (using .../libpam0g_0.79-3.1_amd64.deb) ...
-Unpacking replacement libpam0g ...
-Setting up libpam0g (0.79-3.1) ...
-
-(Reading database ... 10953 files and directories currently installed.)
-Preparing to replace libselinux1 1.28-2 (using .../libselinux1_1.28-4_amd64.deb) ...
-Unpacking replacement libselinux1 ...
-Setting up libselinux1 (1.28-4) ...
-
-(Reading database ... 10953 files and directories currently installed.)
-Preparing to replace libpam-modules 0.79-3 (using .../libpam-modules_0.79-3.1_amd64.deb) ...
-Unpacking replacement libpam-modules ...
-Setting up libpam-modules (0.79-3.1) ...
-
-(Reading database ... 10953 files and directories currently installed.)
-Preparing to replace login 1:4.0.14-4 (using .../login_1%3a4.0.14-6_amd64.deb) ...
-Unpacking replacement login ...
-Setting up login (4.0.14-6) ...
-Installing new version of config file /etc/login.defs ...
-
-(Reading database ... 10953 files and directories currently installed.)
-Preparing to replace perl-modules 5.8.7-10 (using .../perl-modules_5.8.8-2_all.deb) ...
-Unpacking replacement perl-modules ...
 Selecting previously deselected package libdb4.4.
-Unpacking libdb4.4 (from .../libdb4.4_4.4.20-1_amd64.deb) ...
+(Reading database ... 11040 files and directories currently installed.)
+Unpacking libdb4.4 (from .../libdb4.4_4.4.20-2_amd64.deb) ...
 Preparing to replace perl-base 5.8.7-10 (using .../perl-base_5.8.8-2_amd64.deb) ...
 Unpacking replacement perl-base ...
 Setting up perl-base (5.8.8-2) ...
-(Reading database ... 10962 files and directories currently installed.)
+(Reading database ... 11038 files and directories currently installed.)
 Preparing to replace perl 5.8.7-10 (using .../perl_5.8.8-2_amd64.deb) ...
 Unpacking replacement perl ...
 Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-5_amd64.deb) ...
 Unpacking replacement sed ...
 Setting up sed (4.1.4-5) ...
 
-(Reading database ... 10964 files and directories currently installed.)
-Preparing to replace sysvinit 2.86.ds1-4 (using .../sysvinit_2.86.ds1-12_amd64.deb) ...
-Unpacking replacement sysvinit ...
-Setting up sysvinit (2.86.ds1-12) ...
-init: timeout opening/writing control channel /dev/initctl
-
-(Reading database ... 10965 files and directories currently installed.)
-Preparing to replace initscripts 2.86.ds1-4 (using .../initscripts_2.86.ds1-12_amd64.deb) ...
-Unmodified conffile '/etc/init.d/bootclean.sh' obsolete; removed `/etc/init.d/bootclean.sh'
-Unpacking replacement initscripts ...
-Setting up initscripts (2.86.ds1-12) ...
-Installing new version of config file /etc/init.d/bootlogd ...
-Installing new version of config file /etc/init.d/bootmisc.sh ...
-Installing new version of config file /etc/init.d/checkfs.sh ...
-Installing new version of config file /etc/init.d/checkroot.sh ...
-Installing new version of config file /etc/init.d/halt ...
-Installing new version of config file /etc/init.d/hostname.sh ...
-Installing new version of config file /etc/init.d/mountall.sh ...
-Installing new version of config file /etc/init.d/mountnfs.sh ...
-Installing new version of config file /etc/init.d/mountvirtfs ...
-Installing new version of config file /etc/init.d/reboot ...
-Installing new version of config file /etc/init.d/rmnologin ...
-Installing new version of config file /etc/init.d/sendsigs ...
-Installing new version of config file /etc/init.d/single ...
-Installing new version of config file /etc/init.d/umountfs ...
-Installing new version of config file /etc/init.d/umountnfs.sh ...
-Installing new version of config file /etc/init.d/umountroot ...
-Installing new version of config file /etc/init.d/urandom ...
-Installing new version of config file /etc/default/tmpfs ...
-
-(Reading database ... 10979 files and directories currently installed.)
+(Reading database ... 11040 files and directories currently installed.)
 Preparing to replace cpp-4.0 4.0.2-8 (using .../cpp-4.0_4.0.2-9_amd64.deb) ...
 Unpacking replacement cpp-4.0 ...
 Preparing to replace gcc-4.0-base 4.0.2-8 (using .../gcc-4.0-base_4.0.2-9_amd64.deb) ...
@@ -143,7 +89,7 @@ Unpacking replacement libgcc1 ...
 Setting up gcc-4.0-base (4.0.2-9) ...
 Setting up libgcc1 (4.0.2-9) ...
 
-(Reading database ... 10979 files and directories currently installed.)
+(Reading database ... 11040 files and directories currently installed.)
 Preparing to replace gcc-4.0 4.0.2-8 (using .../gcc-4.0_4.0.2-9_amd64.deb) ...
 Unpacking replacement gcc-4.0 ...
 Preparing to replace g++-4.0 4.0.2-8 (using .../g++-4.0_4.0.2-9_amd64.deb) ...
@@ -154,15 +100,10 @@ Preparing to replace libstdc++6 4.0.2-8 (using .../libstdc++6_4.0.2-9_amd64.deb)
 Unpacking replacement libstdc++6 ...
 Setting up libstdc++6 (4.0.2-9) ...
 
-(Reading database ... 10979 files and directories currently installed.)
-Preparing to replace sysv-rc 2.86.ds1-4 (using .../sysv-rc_2.86.ds1-12_all.deb) ...
-Unpacking replacement sysv-rc ...
-Setting up sysv-rc (2.86.ds1-12) ...
-
-(Reading database ... 10989 files and directories currently installed.)
+(Reading database ... 11040 files and directories currently installed.)
 Preparing to replace passwd 1:4.0.14-4 (using .../passwd_1%3a4.0.14-6_amd64.deb) ...
 Unpacking replacement passwd ...
-Preparing to replace adduser 3.80 (using .../archives/adduser_3.83_all.deb) ...
+Preparing to replace adduser 3.80 (using .../archives/adduser_3.84_all.deb) ...
 Unpacking replacement adduser ...
 Preparing to replace dmidecode 2.7-2 (using .../dmidecode_2.8-1_amd64.deb) ...
 Unpacking replacement dmidecode ...
@@ -170,29 +111,27 @@ Preparing to replace sysklogd 1.4.1-17 (using .../sysklogd_1.4.1-17.1_amd64.deb)
 Unpacking replacement sysklogd ...
 Preparing to replace klogd 1.4.1-17 (using .../klogd_1.4.1-17.1_amd64.deb) ...
 Unpacking replacement klogd ...
-Preparing to replace nano 1.3.10-1 (using .../nano_1.3.10-2_amd64.deb) ...
-Unpacking replacement nano ...
-Preparing to replace netkit-inetd 0.10-10.2 (using .../netkit-inetd_0.10-10.3_amd64.deb) ...
-Unpacking replacement netkit-inetd ...
-Preparing to replace dselect 1.13.13 (using .../dselect_1.13.15_amd64.deb) ...
+Preparing to replace dselect 1.13.13 (using .../dselect_1.13.16_amd64.deb) ...
 Unpacking replacement dselect ...
-Preparing to replace dpkg-dev 1.13.13 (using .../dpkg-dev_1.13.15_all.deb) ...
+Preparing to replace procps 1:3.2.5-1 (using .../procps_1%3a3.2.6-2_amd64.deb) ...
+Unpacking replacement procps ...
+Preparing to replace dpkg-dev 1.13.13 (using .../dpkg-dev_1.13.16_all.deb) ...
 Unpacking replacement dpkg-dev ...
+Setting up libdb4.4 (4.4.20-2) ...
 Setting up libc6-dev (2.3.6-1) ...
-Setting up libdb4.4 (4.4.20-1) ...
 Setting up cpp-4.0 (4.0.2-9) ...
 Setting up gcc-4.0 (4.0.2-9) ...
 Setting up passwd (4.0.14-6) ...
 
-Setting up adduser (3.83) ...
+Setting up adduser (3.84) ...
 Installing new version of config file /etc/deluser.conf ...
 
 Setting up dmidecode (2.8-1) ...
-Setting up nano (1.3.10-2) ...
-
-Setting up netkit-inetd (0.10-10.3) ...
+Setting up dselect (1.13.16) ...
+Setting up procps (3.2.6-2) ...
+Installing new version of config file /etc/init.d/procps.sh ...
+Installing new version of config file /etc/sysctl.conf ...
 
-Setting up dselect (1.13.15) ...
 Setting up g++-4.0 (4.0.2-9) ...
 Setting up klogd (1.4.1-17.1) ...
 Installing new version of config file /etc/init.d/klogd ...
@@ -204,7 +143,7 @@ Setting up perl-modules (5.8.8-2) ...
 Setting up libstdc++6-4.0-dev (4.0.2-9) ...
 Setting up perl (5.8.8-2) ...
 
-Setting up dpkg-dev (1.13.15) ...
+Setting up dpkg-dev (1.13.16) ...
 Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
@@ -218,9 +157,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: 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//22779/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//7570/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//22779 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//7570 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid-experimental.log b/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid-experimental.log
index 6d347e0..a202eb6 100644
--- a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid-experimental.log
+++ b/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid-experimental.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//27172/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//11964/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -18,9 +18,9 @@ Get:3 http://ftp.jp.debian.org experimental Release [4245B]
 Ign http://ftp.jp.debian.org experimental Release
 Get:4 http://ftp.jp.debian.org sid Release [5722B]
 Ign http://ftp.jp.debian.org sid Release
-Get:5 http://ftp.jp.debian.org experimental/main Packages [126kB]
+Get:5 http://ftp.jp.debian.org experimental/main Packages [117kB]
 Hit http://ftp.jp.debian.org sid/main Packages
-Fetched 136kB in 0s (311kB/s)
+Fetched 127kB in 0s (418kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org experimental Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
@@ -43,31 +43,31 @@ After unpacking 1610kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   whiptail libnewt0.52 diff gcc-4.1-base libgcc1 libstdc++6 aptitude
   gettext-base console-data
-(Reading database ... 12278 files and directories currently installed.)
+(Reading database ... 12313 files and directories currently installed.)
 Preparing to replace whiptail 0.51.6-31 (using .../whiptail_0.52.2-1_amd64.deb) ...
 Unpacking replacement whiptail ...
-(Reading database ... 12277 files and directories currently installed.)
+(Reading database ... 12312 files and directories currently installed.)
 Removing libnewt0.51 ...
 Selecting previously deselected package libnewt0.52.
-(Reading database ... 12212 files and directories currently installed.)
+(Reading database ... 12247 files and directories currently installed.)
 Unpacking libnewt0.52 (from .../libnewt0.52_0.52.2-1_amd64.deb) ...
 Preparing to replace diff 2.8.1-11 (using .../diff_2.8.7-0.2_amd64.deb) ...
 Unpacking replacement diff ...
 Setting up diff (2.8.7-0.2) ...
 Selecting previously deselected package gcc-4.1-base.
-(Reading database ... 12284 files and directories currently installed.)
+(Reading database ... 12319 files and directories currently installed.)
 Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1-0exp7_amd64.deb) ...
 Preparing to replace libgcc1 1:4.0.2-9 (using .../libgcc1_1%3a4.1-0exp7_amd64.deb) ...
 Unpacking replacement libgcc1 ...
 Setting up gcc-4.1-base (4.1-0exp7) ...
 Setting up libgcc1 (4.1-0exp7) ...
 
-(Reading database ... 12290 files and directories currently installed.)
+(Reading database ... 12325 files and directories currently installed.)
 Preparing to replace libstdc++6 4.0.2-9 (using .../libstdc++6_4.1-0exp7_amd64.deb) ...
 Unpacking replacement libstdc++6 ...
 Setting up libstdc++6 (4.1-0exp7) ...
 
-(Reading database ... 12290 files and directories currently installed.)
+(Reading database ... 12325 files and directories currently installed.)
 Preparing to replace aptitude 0.4.1-1 (using .../aptitude_0.4.1-1experimental1_amd64.deb) ...
 Unpacking replacement aptitude ...
 Preparing to replace gettext-base 0.14.5-2 (using .../gettext-base_0.14.5-2.csharp.1_amd64.deb) ...
@@ -104,10 +104,10 @@ Need to get 0B/1501kB of archives.
 After unpacking 9462kB disk space will be freed.
 WARNING: The following packages cannot be authenticated!
   apt-utils apt
-(Reading database ... 12261 files and directories currently installed.)
+(Reading database ... 12296 files and directories currently installed.)
 Removing tasksel ...
 Removing aptitude ...
-(Reading database ... 12069 files and directories currently installed.)
+(Reading database ... 12104 files and directories currently installed.)
 Preparing to replace apt-utils 0.6.43.2 (using .../apt-utils_0.6.43.2exp1_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Preparing to replace apt 0.6.43.2 (using .../apt_0.6.43.2exp1_amd64.deb) ...
@@ -121,10 +121,11 @@ umount: /sys: not mounted
 umount: /run: not found
 umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
-tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh: line 14: kill: (23954) - No such process
- -> user script /var/cache/pbuilder/build//27172/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+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//11964/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//27172 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//11964 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log b/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log
index c0cdb7a..e05aacf 100644
--- a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//25194/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//10259/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -13,8 +13,8 @@ Refreshing the base.tgz
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org sid Release [5722B]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [3926kB]
-Fetched 3932kB in 2s (1507kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [3933kB]
+Fetched 3939kB in 2s (1751kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: You may want to run apt-get update to correct these problems
@@ -25,119 +25,65 @@ Building dependency tree...
 The following NEW packages will be installed:
   libdb4.4
 The following packages will be upgraded:
-  adduser console-common coreutils cpp-3.3 cpp-4.0 dmidecode dpkg dpkg-dev
-  dselect g++-3.3 g++-4.0 gcc-3.3 gcc-3.3-base gcc-4.0 gcc-4.0-base
-  initscripts klogd libc6 libc6-dev libdb1-compat libgcc1 libpam-modules
-  libpam-runtime libpam0g libselinux1 libstdc++5 libstdc++5-3.3-dev libstdc++6
-  libstdc++6-4.0-dev login modutils nano netkit-inetd passwd perl perl-base
-  perl-modules procps sed sysklogd sysv-rc sysvinit
-42 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/37.3MB of archives.
-After unpacking 1561kB of additional disk space will be used.
+  adduser coreutils cpp-3.3 cpp-4.0 dmidecode dpkg dpkg-dev dselect g++-3.3
+  g++-4.0 gcc-3.3 gcc-3.3-base gcc-4.0 gcc-4.0-base klogd libc6 libc6-dev
+  libdb1-compat libgcc1 libstdc++5 libstdc++5-3.3-dev libstdc++6
+  libstdc++6-4.0-dev login modutils passwd perl perl-base perl-modules procps
+  sed sysklogd
+32 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Need to get 0B/36.1MB of archives.
+After unpacking 1954kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
-  dpkg coreutils libc6-dev libc6 libpam-runtime libpam0g libselinux1
-  libpam-modules login perl-modules libdb4.4 perl-base perl sed sysvinit
-  console-common initscripts cpp-4.0 gcc-4.0-base libgcc1 gcc-4.0 g++-4.0
-  libstdc++6-4.0-dev libstdc++6 sysv-rc passwd adduser dmidecode sysklogd
-  klogd modutils nano netkit-inetd dselect procps dpkg-dev g++-3.3 gcc-3.3
-  cpp-3.3 gcc-3.3-base libstdc++5 libstdc++5-3.3-dev libdb1-compat
-(Reading database ... 12299 files and directories currently installed.)
-Preparing to replace dpkg 1.13.13 (using .../dpkg_1.13.15_amd64.deb) ...
+  dpkg coreutils login perl-modules libc6-dev libc6 libdb4.4 perl-base perl
+  sed cpp-4.0 gcc-4.0-base libgcc1 gcc-4.0 g++-4.0 libstdc++6-4.0-dev
+  libstdc++6 passwd adduser dmidecode sysklogd klogd modutils dselect procps
+  dpkg-dev g++-3.3 gcc-3.3 cpp-3.3 gcc-3.3-base libstdc++5 libstdc++5-3.3-dev
+  libdb1-compat
+(Reading database ... 12327 files and directories currently installed.)
+Preparing to replace dpkg 1.13.13 (using .../dpkg_1.13.16_amd64.deb) ...
 Unpacking replacement dpkg ...
-Setting up dpkg (1.13.15) ...
+Setting up dpkg (1.13.16) ...
 
-(Reading database ... 12274 files and directories currently installed.)
+(Reading database ... 12303 files and directories currently installed.)
 Preparing to replace coreutils 5.2.1-2.1 (using .../coreutils_5.93-5_amd64.deb) ...
 Removing `local diversion of /usr/share/man/man1/md5sum.textutils.1.gz to /usr/share/man/man1/md5sum.1.gz'
 Removing `local diversion of /usr/bin/md5sum.textutils to /usr/bin/md5sum'
 Unpacking replacement coreutils ...
 Setting up coreutils (5.93-5) ...
 
-(Reading database ... 12288 files and directories currently installed.)
+(Reading database ... 12317 files and directories currently installed.)
+Preparing to replace login 1:4.0.14-4 (using .../login_1%3a4.0.14-6_amd64.deb) ...
+Unpacking replacement login ...
+Setting up login (4.0.14-6) ...
+Installing new version of config file /etc/login.defs ...
+
+(Reading database ... 12317 files and directories currently installed.)
+Preparing to replace perl-modules 5.8.7-10 (using .../perl-modules_5.8.8-2_all.deb) ...
+Unpacking replacement perl-modules ...
 Preparing to replace libc6-dev 2.3.5-13 (using .../libc6-dev_2.3.6-1_amd64.deb) ...
 Unpacking replacement libc6-dev ...
 Preparing to replace libc6 2.3.5-13 (using .../libc6_2.3.6-1_amd64.deb) ...
 Unpacking replacement libc6 ...
 Setting up libc6 (2.3.6-1) ...
 Current default timezone: 'UTC'.
-Local time is now:      Sat Feb 18 03:43:39 UTC 2006.
-Universal Time is now:  Sat Feb 18 03:43:39 UTC 2006.
+Local time is now:      Wed Feb 22 03:34:34 UTC 2006.
+Universal Time is now:  Wed Feb 22 03:34:34 UTC 2006.
 Run 'tzconfig' if you wish to change it.
 
-(Reading database ... 12261 files and directories currently installed.)
-Preparing to replace libpam-runtime 0.79-3 (using .../libpam-runtime_0.79-3.1_all.deb) ...
-Unpacking replacement libpam-runtime ...
-Setting up libpam-runtime (0.79-3.1) ...
-
-(Reading database ... 12261 files and directories currently installed.)
-Preparing to replace libpam0g 0.79-3 (using .../libpam0g_0.79-3.1_amd64.deb) ...
-Unpacking replacement libpam0g ...
-Setting up libpam0g (0.79-3.1) ...
-
-(Reading database ... 12261 files and directories currently installed.)
-Preparing to replace libselinux1 1.28-2 (using .../libselinux1_1.28-4_amd64.deb) ...
-Unpacking replacement libselinux1 ...
-Setting up libselinux1 (1.28-4) ...
-
-(Reading database ... 12261 files and directories currently installed.)
-Preparing to replace libpam-modules 0.79-3 (using .../libpam-modules_0.79-3.1_amd64.deb) ...
-Unpacking replacement libpam-modules ...
-Setting up libpam-modules (0.79-3.1) ...
-
-(Reading database ... 12261 files and directories currently installed.)
-Preparing to replace login 1:4.0.14-4 (using .../login_1%3a4.0.14-6_amd64.deb) ...
-Unpacking replacement login ...
-Setting up login (4.0.14-6) ...
-Installing new version of config file /etc/login.defs ...
-
-(Reading database ... 12261 files and directories currently installed.)
-Preparing to replace perl-modules 5.8.7-10 (using .../perl-modules_5.8.8-2_all.deb) ...
-Unpacking replacement perl-modules ...
 Selecting previously deselected package libdb4.4.
-Unpacking libdb4.4 (from .../libdb4.4_4.4.20-1_amd64.deb) ...
+(Reading database ... 12301 files and directories currently installed.)
+Unpacking libdb4.4 (from .../libdb4.4_4.4.20-2_amd64.deb) ...
 Preparing to replace perl-base 5.8.7-10 (using .../perl-base_5.8.8-2_amd64.deb) ...
 Unpacking replacement perl-base ...
 Setting up perl-base (5.8.8-2) ...
-(Reading database ... 12270 files and directories currently installed.)
+(Reading database ... 12299 files and directories currently installed.)
 Preparing to replace perl 5.8.7-10 (using .../perl_5.8.8-2_amd64.deb) ...
 Unpacking replacement perl ...
 Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-5_amd64.deb) ...
 Unpacking replacement sed ...
 Setting up sed (4.1.4-5) ...
 
-(Reading database ... 12272 files and directories currently installed.)
-Preparing to replace sysvinit 2.86.ds1-4 (using .../sysvinit_2.86.ds1-12_amd64.deb) ...
-Unpacking replacement sysvinit ...
-Setting up sysvinit (2.86.ds1-12) ...
-init: timeout opening/writing control channel /dev/initctl
-
-(Reading database ... 12273 files and directories currently installed.)
-Preparing to replace console-common 0.7.55 (using .../console-common_0.7.55.1_all.deb) ...
-Unpacking replacement console-common ...
-Preparing to replace initscripts 2.86.ds1-4 (using .../initscripts_2.86.ds1-12_amd64.deb) ...
-Unmodified conffile '/etc/init.d/bootclean.sh' obsolete; removed `/etc/init.d/bootclean.sh'
-Unpacking replacement initscripts ...
-Setting up initscripts (2.86.ds1-12) ...
-Installing new version of config file /etc/init.d/bootlogd ...
-Installing new version of config file /etc/init.d/bootmisc.sh ...
-Installing new version of config file /etc/init.d/checkfs.sh ...
-Installing new version of config file /etc/init.d/checkroot.sh ...
-Installing new version of config file /etc/init.d/halt ...
-Installing new version of config file /etc/init.d/hostname.sh ...
-Installing new version of config file /etc/init.d/mountall.sh ...
-Installing new version of config file /etc/init.d/mountnfs.sh ...
-Installing new version of config file /etc/init.d/mountvirtfs ...
-Installing new version of config file /etc/init.d/reboot ...
-Installing new version of config file /etc/init.d/rmnologin ...
-Installing new version of config file /etc/init.d/sendsigs ...
-Installing new version of config file /etc/init.d/single ...
-Installing new version of config file /etc/init.d/umountfs ...
-Installing new version of config file /etc/init.d/umountnfs.sh ...
-Installing new version of config file /etc/init.d/umountroot ...
-Installing new version of config file /etc/init.d/urandom ...
-Installing new version of config file /etc/default/tmpfs ...
-
-(Reading database ... 12288 files and directories currently installed.)
+(Reading database ... 12301 files and directories currently installed.)
 Preparing to replace cpp-4.0 4.0.2-8 (using .../cpp-4.0_4.0.2-9_amd64.deb) ...
 Unpacking replacement cpp-4.0 ...
 Preparing to replace gcc-4.0-base 4.0.2-8 (using .../gcc-4.0-base_4.0.2-9_amd64.deb) ...
@@ -147,7 +93,7 @@ Unpacking replacement libgcc1 ...
 Setting up gcc-4.0-base (4.0.2-9) ...
 Setting up libgcc1 (4.0.2-9) ...
 
-(Reading database ... 12288 files and directories currently installed.)
+(Reading database ... 12301 files and directories currently installed.)
 Preparing to replace gcc-4.0 4.0.2-8 (using .../gcc-4.0_4.0.2-9_amd64.deb) ...
 Unpacking replacement gcc-4.0 ...
 Preparing to replace g++-4.0 4.0.2-8 (using .../g++-4.0_4.0.2-9_amd64.deb) ...
@@ -158,15 +104,10 @@ Preparing to replace libstdc++6 4.0.2-8 (using .../libstdc++6_4.0.2-9_amd64.deb)
 Unpacking replacement libstdc++6 ...
 Setting up libstdc++6 (4.0.2-9) ...
 
-(Reading database ... 12288 files and directories currently installed.)
-Preparing to replace sysv-rc 2.86.ds1-4 (using .../sysv-rc_2.86.ds1-12_all.deb) ...
-Unpacking replacement sysv-rc ...
-Setting up sysv-rc (2.86.ds1-12) ...
-
-(Reading database ... 12298 files and directories currently installed.)
+(Reading database ... 12301 files and directories currently installed.)
 Preparing to replace passwd 1:4.0.14-4 (using .../passwd_1%3a4.0.14-6_amd64.deb) ...
 Unpacking replacement passwd ...
-Preparing to replace adduser 3.80 (using .../archives/adduser_3.83_all.deb) ...
+Preparing to replace adduser 3.80 (using .../archives/adduser_3.84_all.deb) ...
 Unpacking replacement adduser ...
 Preparing to replace dmidecode 2.7-2 (using .../dmidecode_2.8-1_amd64.deb) ...
 Unpacking replacement dmidecode ...
@@ -176,15 +117,11 @@ Preparing to replace klogd 1.4.1-17 (using .../klogd_1.4.1-17.1_amd64.deb) ...
 Unpacking replacement klogd ...
 Preparing to replace modutils 2.4.27.0-3 (using .../modutils_2.4.27.0-4_amd64.deb) ...
 Unpacking replacement modutils ...
-Preparing to replace nano 1.3.10-1 (using .../nano_1.3.10-2_amd64.deb) ...
-Unpacking replacement nano ...
-Preparing to replace netkit-inetd 0.10-10.2 (using .../netkit-inetd_0.10-10.3_amd64.deb) ...
-Unpacking replacement netkit-inetd ...
-Preparing to replace dselect 1.13.13 (using .../dselect_1.13.15_amd64.deb) ...
+Preparing to replace dselect 1.13.13 (using .../dselect_1.13.16_amd64.deb) ...
 Unpacking replacement dselect ...
-Preparing to replace procps 1:3.2.1-2 (using .../procps_1%3a3.2.6-2_amd64.deb) ...
+Preparing to replace procps 1:3.2.5-1 (using .../procps_1%3a3.2.6-2_amd64.deb) ...
 Unpacking replacement procps ...
-Preparing to replace dpkg-dev 1.13.13 (using .../dpkg-dev_1.13.15_all.deb) ...
+Preparing to replace dpkg-dev 1.13.13 (using .../dpkg-dev_1.13.16_all.deb) ...
 Unpacking replacement dpkg-dev ...
 Preparing to replace g++-3.3 1:3.3.6-10 (using .../g++-3.3_1%3a3.3.6-12_amd64.deb) ...
 Unpacking replacement g++-3.3 ...
@@ -200,28 +137,20 @@ Preparing to replace libstdc++5-3.3-dev 1:3.3.6-10 (using .../libstdc++5-3.3-dev
 Unpacking replacement libstdc++5-3.3-dev ...
 Preparing to replace libdb1-compat 2.1.3-8 (using .../libdb1-compat_2.1.3-9_amd64.deb) ...
 Unpacking replacement libdb1-compat ...
+Setting up libdb4.4 (4.4.20-2) ...
 Setting up libc6-dev (2.3.6-1) ...
-Setting up libdb4.4 (4.4.20-1) ...
-Setting up console-common (0.7.55.1) ...
-Looking for keymap to install:
-NONE
-
 Setting up cpp-4.0 (4.0.2-9) ...
 Setting up gcc-4.0 (4.0.2-9) ...
 Setting up passwd (4.0.14-6) ...
 
-Setting up adduser (3.83) ...
+Setting up adduser (3.84) ...
 Installing new version of config file /etc/deluser.conf ...
 
 Setting up dmidecode (2.8-1) ...
 Setting up modutils (2.4.27.0-4) ...
 Architecture-specific modutils configuration for x86_64 not found, using defaults
 
-Setting up nano (1.3.10-2) ...
-
-Setting up netkit-inetd (0.10-10.3) ...
-
-Setting up dselect (1.13.15) ...
+Setting up dselect (1.13.16) ...
 Setting up procps (3.2.6-2) ...
 Installing new version of config file /etc/init.d/procps.sh ...
 Installing new version of config file /etc/sysctl.conf ...
@@ -246,7 +175,7 @@ Setting up g++-4.0 (4.0.2-9) ...
 Setting up libstdc++5-3.3-dev (3.3.6-12) ...
 Setting up perl (5.8.8-2) ...
 
-Setting up dpkg-dev (1.13.15) ...
+Setting up dpkg-dev (1.13.16) ...
 Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
@@ -258,10 +187,11 @@ umount: /sys: not mounted
 umount: /run: not found
 umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
-tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh: line 14: kill: (23954) - No such process
- -> user script /var/cache/pbuilder/build//25194/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+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//10259/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//25194 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//10259 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log b/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log
index ae78da1..41dae84 100644
--- a/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log
@@ -1,18 +1,18 @@
 Upgrading for distribution etch
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//21074/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//6020/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
 Refreshing the base.tgz 
  -> upgrading packages
-Get:1 http://ftp.jp.debian.org etch/main Packages [3640kB]
+Get:1 http://ftp.jp.debian.org etch/main Packages [3650kB]
 Get:2 http://ftp.jp.debian.org etch/main Release [96B]
-Fetched 3640kB in 2s (1581kB/s)
+Fetched 3650kB in 2s (1659kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -37,10 +37,10 @@ The following packages will be upgraded:
   libtext-charwidth-perl libtext-iconv-perl libtext-wrapi18n-perl libuuid1
   linux-kernel-headers login logrotate make makedev man-db manpages
   module-init-tools modutils mount nano ncurses-base ncurses-bin net-tools
-  netbase netkit-inetd passwd patch perl perl-base perl-modules psmisc sysv-rc
-  sysvinit tar tasksel telnet util-linux wget whiptail zlib1g
-113 upgraded, 17 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/63.4MB of archives.
+  netbase netkit-inetd passwd patch perl perl-base perl-modules procps psmisc
+  sysv-rc sysvinit tar tasksel telnet util-linux wget whiptail zlib1g
+114 upgraded, 17 newly installed, 0 to remove and 0 not upgraded.
+Need to get 0B/63.7MB of archives.
 After unpacking 37.7MB of additional disk space will be used.
 (Reading database ... 10733 files and directories currently installed.)
 Preparing to replace linux-kernel-headers 2.5.999-test7-bk-17 (using .../linux-kernel-headers_2.6.13+0rc3-2_amd64.deb) ...
@@ -74,8 +74,8 @@ Unpacking replacement libc6 ...
 Setting up libc6 (2.3.5-13) ...
 Checking for services that may need to be restarted...done.
 Current default timezone: 'UTC'.
-Local time is now:      Sat Feb 18 03:41:42 UTC 2006.
-Universal Time is now:  Sat Feb 18 03:41:42 UTC 2006.
+Local time is now:      Wed Feb 22 03:32:42 UTC 2006.
+Universal Time is now:  Wed Feb 22 03:32:42 UTC 2006.
 Run 'tzconfig' if you wish to change it.
 
 (Reading database ... 11067 files and directories currently installed.)
@@ -176,28 +176,28 @@ Setting up libsepol1 (1.10-2) ...
 
 Selecting previously deselected package libselinux1.
 (Reading database ... 11115 files and directories currently installed.)
-Unpacking libselinux1 (from .../libselinux1_1.28-2_amd64.deb) ...
-Setting up libselinux1 (1.28-2) ...
+Unpacking libselinux1 (from .../libselinux1_1.28-4_amd64.deb) ...
+Setting up libselinux1 (1.28-4) ...
 
 (Reading database ... 11120 files and directories currently installed.)
-Preparing to replace libpam-runtime 0.76-22 (using .../libpam-runtime_0.79-3_all.deb) ...
+Preparing to replace libpam-runtime 0.76-22 (using .../libpam-runtime_0.79-3.1_all.deb) ...
 Unpacking replacement libpam-runtime ...
-Setting up libpam-runtime (0.79-3) ...
+Setting up libpam-runtime (0.79-3.1) ...
 Installing new version of config file /etc/pam.conf ...
 
 (Reading database ... 11120 files and directories currently installed.)
-Preparing to replace libpam0g 0.76-22 (using .../libpam0g_0.79-3_amd64.deb) ...
+Preparing to replace libpam0g 0.76-22 (using .../libpam0g_0.79-3.1_amd64.deb) ...
 Unpacking replacement libpam0g ...
-Setting up libpam0g (0.79-3) ...
+Setting up libpam0g (0.79-3.1) ...
 
 (Reading database ... 11120 files and directories currently installed.)
-Preparing to replace libpam-modules 0.76-22 (using .../libpam-modules_0.79-3_amd64.deb) ...
+Preparing to replace libpam-modules 0.76-22 (using .../libpam-modules_0.79-3.1_amd64.deb) ...
 Unpacking replacement libpam-modules ...
 Setting up libdb4.3 (4.3.29-4) ...
-Setting up libpam-modules (0.79-3) ...
+Setting up libpam-modules (0.79-3.1) ...
+Installing new version of config file /etc/security/limits.conf ...
 Installing new version of config file /etc/security/access.conf ...
 Installing new version of config file /etc/security/pam_env.conf ...
-Installing new version of config file /etc/security/limits.conf ...
 
 (Reading database ... 11124 files and directories currently installed.)
 Preparing to replace login 1:4.0.3-31sarge5 (using .../login_1%3a4.0.14-4_amd64.deb) ...
@@ -225,33 +225,38 @@ Preparing to replace perl-base 5.8.4-8 (using .../perl-base_5.8.7-10_amd64.deb)
 Unpacking replacement perl-base ...
 Setting up perl-base (5.8.7-10) ...
 (Reading database ... 11679 files and directories currently installed.)
-Preparing to replace sysvinit 2.86.ds1-1 (using .../sysvinit_2.86.ds1-4_amd64.deb) ...
+Preparing to replace sysv-rc 2.86.ds1-1 (using .../sysv-rc_2.86.ds1-12_all.deb) ...
+Unpacking replacement sysv-rc ...
+Setting up sysv-rc (2.86.ds1-12) ...
+
+(Reading database ... 11689 files and directories currently installed.)
+Preparing to replace sysvinit 2.86.ds1-1 (using .../sysvinit_2.86.ds1-12_amd64.deb) ...
 Unpacking replacement sysvinit ...
-Setting up sysvinit (2.86.ds1-4) ...
+Setting up sysvinit (2.86.ds1-12) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 11679 files and directories currently installed.)
+(Reading database ... 11690 files and directories currently installed.)
 Preparing to replace tar 1.14-2 (using .../tar_1.15.1-2_amd64.deb) ...
 Unpacking replacement tar ...
 Setting up tar (1.15.1-2) ...
 
 Selecting previously deselected package lsb-base.
-(Reading database ... 11683 files and directories currently installed.)
+(Reading database ... 11694 files and directories currently installed.)
 Unpacking lsb-base (from .../lsb-base_3.0-15_all.deb) ...
 Setting up lsb-base (3.0-15) ...
 Selecting previously deselected package libslang2.
-(Reading database ... 11690 files and directories currently installed.)
+(Reading database ... 11701 files and directories currently installed.)
 Unpacking libslang2 (from .../libslang2_2.0.5-3_amd64.deb) ...
 Setting up libslang2 (2.0.5-3) ...
 
-(Reading database ... 11702 files and directories currently installed.)
+(Reading database ... 11713 files and directories currently installed.)
 Preparing to replace util-linux 2.12p-4 (using .../util-linux_2.12r-6_amd64.deb) ...
 Unpacking replacement util-linux ...
 Setting up util-linux (2.12r-6) ...
 Installing new version of config file /etc/init.d/hwclock.sh ...
 Installing new version of config file /etc/init.d/hwclockfirst.sh ...
 
-(Reading database ... 11702 files and directories currently installed.)
+(Reading database ... 11713 files and directories currently installed.)
 Preparing to replace ncurses-base 5.4-4 (using .../ncurses-base_5.5-1_all.deb) ...
 Removing obsolete conffile /etc/terminfo/E/Eterm ...
 Removing obsolete conffile /etc/terminfo/E/Eterm-color ...
@@ -289,7 +294,7 @@ Removing obsolete conffile /etc/terminfo/x/xterm-vt220 ...
 Removing obsolete conffile /etc/terminfo/x/xterm-color ...
 Unpacking replacement ncurses-base ...
 Setting up ncurses-base (5.5-1) ...
-(Reading database ... 11706 files and directories currently installed.)
+(Reading database ... 11717 files and directories currently installed.)
 Preparing to replace liblocale-gettext-perl 1.01-17 (using .../liblocale-gettext-perl_1.05-1_amd64.deb) ...
 Unpacking replacement liblocale-gettext-perl ...
 Preparing to replace libtext-iconv-perl 1.2-3 (using .../libtext-iconv-perl_1.4-2_amd64.deb) ...
@@ -315,8 +320,8 @@ Setting up libtext-wrapi18n-perl (0.06-4) ...
 Setting up debconf-i18n (1.4.70) ...
 Setting up debconf (1.4.70) ...
 
-(Reading database ... 11734 files and directories currently installed.)
-Preparing to replace console-common 0.7.49 (using .../console-common_0.7.55_all.deb) ...
+(Reading database ... 11745 files and directories currently installed.)
+Preparing to replace console-common 0.7.49 (using .../console-common_0.7.55.1_all.deb) ...
 Unpacking replacement console-common ...
 Selecting previously deselected package gcc-4.0-base.
 Unpacking gcc-4.0-base (from .../gcc-4.0-base_4.0.2-8_amd64.deb) ...
@@ -326,11 +331,11 @@ Setting up gcc-4.0-base (4.0.2-8) ...
 Setting up libgcc1 (4.0.2-8) ...
 
 Selecting previously deselected package libstdc++6.
-(Reading database ... 11746 files and directories currently installed.)
+(Reading database ... 11758 files and directories currently installed.)
 Unpacking libstdc++6 (from .../libstdc++6_4.0.2-8_amd64.deb) ...
 Setting up libstdc++6 (4.0.2-8) ...
 
-(Reading database ... 11749 files and directories currently installed.)
+(Reading database ... 11761 files and directories currently installed.)
 Preparing to replace apt-utils 0.5.28.6 (using .../apt-utils_0.6.43.2_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Selecting previously deselected package libncursesw5.
@@ -343,16 +348,16 @@ Preparing to replace apt 0.5.28.6 (using .../apt_0.6.43.2_amd64.deb) ...
 Unpacking replacement apt ...
 Setting up apt (0.6.43.2) ...
 
-(Reading database ... 11776 files and directories currently installed.)
+(Reading database ... 11788 files and directories currently installed.)
 Preparing to replace dselect 1.10.28 (using .../dselect_1.13.13_amd64.deb) ...
 Unpacking replacement dselect ...
 Setting up dselect (1.13.13) ...
 Installing new version of config file /etc/dpkg/dselect.cfg ...
-(Reading database ... 11776 files and directories currently installed.)
-Preparing to replace initscripts 2.86.ds1-1 (using .../initscripts_2.86.ds1-4_amd64.deb) ...
+(Reading database ... 11788 files and directories currently installed.)
+Preparing to replace initscripts 2.86.ds1-1 (using .../initscripts_2.86.ds1-12_amd64.deb) ...
+Unmodified conffile '/etc/init.d/bootclean.sh' obsolete; removed `/etc/init.d/bootclean.sh'
 Unpacking replacement initscripts ...
-Setting up initscripts (2.86.ds1-4) ...
-Installing new version of config file /etc/init.d/bootclean.sh ...
+Setting up initscripts (2.86.ds1-12) ...
 Installing new version of config file /etc/init.d/bootlogd ...
 Installing new version of config file /etc/init.d/bootmisc.sh ...
 Installing new version of config file /etc/init.d/checkfs.sh ...
@@ -371,7 +376,7 @@ Installing new version of config file /etc/init.d/umountnfs.sh ...
 Installing new version of config file /etc/init.d/urandom ...
 Installing new version of config file /etc/default/tmpfs ...
 
-(Reading database ... 11777 files and directories currently installed.)
+(Reading database ... 11803 files and directories currently installed.)
 Preparing to replace libattr1 2.4.16-1 (using .../libattr1_2.4.25-1_amd64.deb) ...
 Unpacking replacement libattr1 ...
 Preparing to replace libacl1 2.2.23-1 (using .../libacl1_2.2.34-1_amd64.deb) ...
@@ -380,27 +385,27 @@ Setting up libattr1 (2.4.25-1) ...
 
 Setting up libacl1 (2.2.34-1) ...
 
-(Reading database ... 11777 files and directories currently installed.)
+(Reading database ... 11803 files and directories currently installed.)
 Preparing to replace libblkid1 1.37-2sarge1 (using .../libblkid1_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement libblkid1 ...
 Setting up libblkid1 (1.38+1.39-WIP-2005.12.31-1) ...
 
-(Reading database ... 11777 files and directories currently installed.)
+(Reading database ... 11803 files and directories currently installed.)
 Preparing to replace libcomerr2 1.37-2sarge1 (using .../libcomerr2_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement libcomerr2 ...
 Setting up libcomerr2 (1.38+1.39-WIP-2005.12.31-1) ...
 
-(Reading database ... 11777 files and directories currently installed.)
+(Reading database ... 11803 files and directories currently installed.)
 Preparing to replace libss2 1.37-2sarge1 (using .../libss2_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement libss2 ...
 Setting up libss2 (1.38+1.39-WIP-2005.12.31-1) ...
 
-(Reading database ... 11777 files and directories currently installed.)
+(Reading database ... 11803 files and directories currently installed.)
 Preparing to replace libuuid1 1.37-2sarge1 (using .../libuuid1_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement libuuid1 ...
 Setting up libuuid1 (1.38+1.39-WIP-2005.12.31-1) ...
 
-(Reading database ... 11777 files and directories currently installed.)
+(Reading database ... 11803 files and directories currently installed.)
 Preparing to replace libgpg-error0 1.0-1 (using .../libgpg-error0_1.1-4_amd64.deb) ...
 Unpacking replacement libgpg-error0 ...
 Preparing to replace libgcrypt11 1.2.0-11.1 (using .../libgcrypt11_1.2.2-1_amd64.deb) ...
@@ -409,7 +414,7 @@ Preparing to replace zlib1g 1:1.2.2-4 (using .../zlib1g_1%3a1.2.3-9_amd64.deb) .
 Unpacking replacement zlib1g ...
 Setting up zlib1g (1.2.3-9) ...
 
-(Reading database ... 11777 files and directories currently installed.)
+(Reading database ... 11803 files and directories currently installed.)
 Preparing to replace libopencdk8 0.5.5-10 (using .../libopencdk8_0.5.7-2_amd64.deb) ...
 Unpacking replacement libopencdk8 ...
 Preparing to replace libtasn1-2 0.2.10-3 (using .../libtasn1-2_0.2.17-1_amd64.deb) ...
@@ -430,7 +435,7 @@ Preparing to replace cron 3.0pl1-86 (using .../cron_3.0pl1-92_amd64.deb) ...
 Unpacking replacement cron ...
 Preparing to replace exim4-config 4.50-8 (using .../exim4-config_4.60-3_all.deb) ...
 Unpacking replacement exim4-config ...
-Preparing to replace netkit-inetd 0.10-10 (using .../netkit-inetd_0.10-10.2_amd64.deb) ...
+Preparing to replace netkit-inetd 0.10-10 (using .../netkit-inetd_0.10-10.3_amd64.deb) ...
 Unpacking replacement netkit-inetd ...
 Preparing to replace iputils-ping 3:20020927-2 (using .../iputils-ping_3%3a20020927-3_amd64.deb) ...
 Unpacking replacement iputils-ping ...
@@ -444,12 +449,7 @@ Setting up passwd (4.0.14-4) ...
 Installing new version of config file /etc/pam.d/chfn ...
 Installing new version of config file /etc/pam.d/chsh ...
 
-(Reading database ... 11907 files and directories currently installed.)
-Preparing to replace sysv-rc 2.86.ds1-1 (using .../sysv-rc_2.86.ds1-4_all.deb) ...
-Unpacking replacement sysv-rc ...
-Setting up sysv-rc (2.86.ds1-4) ...
-
-(Reading database ... 11907 files and directories currently installed.)
+(Reading database ... 11933 files and directories currently installed.)
 Preparing to replace binutils 2.15-6 (using .../binutils_2.16.1cvs20060117-1_amd64.deb) ...
 Unpacking replacement binutils ...
 Preparing to replace libstdc++5-3.3-dev 1:3.3.5-13 (using .../libstdc++5-3.3-dev_1%3a3.3.6-10_amd64.deb) ...
@@ -468,7 +468,7 @@ Setting up gcc-3.3-base (3.3.6-10) ...
 Setting up libstdc++5 (3.3.6-10) ...
 
 Selecting previously deselected package dmidecode.
-(Reading database ... 11929 files and directories currently installed.)
+(Reading database ... 11955 files and directories currently installed.)
 Unpacking dmidecode (from .../dmidecode_2.7-2_amd64.deb) ...
 Selecting previously deselected package laptop-detect.
 Unpacking laptop-detect (from .../laptop-detect_0.12.1_amd64.deb) ...
@@ -502,7 +502,7 @@ Preparing to replace module-init-tools 3.2-pre1-2 (using .../module-init-tools_3
 Unpacking replacement module-init-tools ...
 Preparing to replace modutils 2.4.26-1.2 (using .../modutils_2.4.27.0-3_amd64.deb) ...
 Unpacking replacement modutils ...
-Preparing to replace nano 1.2.4-5 (using .../nano_1.3.10-1_amd64.deb) ...
+Preparing to replace nano 1.2.4-5 (using .../nano_1.3.10-2_amd64.deb) ...
 Unpacking replacement nano ...
 Preparing to replace net-tools 1.60-10 (using .../net-tools_1.60-17_amd64.deb) ...
 Unpacking replacement net-tools ...
@@ -514,6 +514,8 @@ Preparing to replace libnewt0.51 0.51.6-20 (using .../libnewt0.51_0.51.6-31_amd6
 Unpacking replacement libnewt0.51 ...
 Preparing to replace makedev 2.3.1-77 (using .../makedev_2.3.1-80_all.deb) ...
 Unpacking replacement makedev ...
+Preparing to replace procps 1:3.2.1-2 (using .../procps_1%3a3.2.5-1_amd64.deb) ...
+Unpacking replacement procps ...
 Preparing to replace at 3.1.8-11 (using .../archives/at_3.1.10_amd64.deb) ...
 Stopping deferred execution scheduler: atd.
 Unpacking replacement at ...
@@ -608,8 +610,7 @@ Installing new version of config file /etc/exim4/conf.d/transport/30_exim4-confi
 Installing new version of config file /etc/exim4/passwd.client ...
 Installing new version of config file /etc/exim4/exim4.conf.template ...
 
-Setting up netkit-inetd (0.10-10.2) ...
-Restarting internet superserver: inetd.
+Setting up netkit-inetd (0.10-10.3) ...
 
 Setting up iputils-ping (20020927-3) ...
 Setting up netbase (4.24) ...
@@ -664,7 +665,7 @@ Installing new version of config file /etc/modutils/aliases ...
 Installing new version of config file /etc/modutils/actions ...
 Architecture-specific modutils configuration for x86_64 not found, using defaults
 
-Setting up nano (1.3.10-1) ...
+Setting up nano (1.3.10-2) ...
 Installing new version of config file /etc/nanorc ...
 
 Setting up net-tools (1.60-17) ...
@@ -677,6 +678,10 @@ Setting up whiptail (0.51.6-31) ...
 Setting up makedev (2.3.1-80) ...
 Installing new version of config file /etc/init.d/makedev ...
 
+Setting up procps (3.2.5-1) ...
+Installing new version of config file /etc/sysctl.conf ...
+Installing new version of config file /etc/init.d/procps.sh ...
+
 Setting up at (3.1.10) ...
 Installing new version of config file /etc/init.d/atd ...
 
@@ -708,7 +713,7 @@ Setting up libssl0.9.7 (0.9.7g-5) ...
 Setting up libstdc++5-3.3-dev (3.3.6-10) ...
 Setting up libstdc++6-4.0-dev (4.0.2-8) ...
 Setting up perl-modules (5.8.7-10) ...
-Setting up console-common (0.7.55) ...
+Setting up console-common (0.7.55.1) ...
 Installing new version of config file /etc/init.d/keymap.sh ...
 Looking for keymap to install:
 NONE
@@ -737,9 +742,11 @@ umount: /sys: not mounted
 umount: /run: not found
 umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
- -> user script /var/cache/pbuilder/build//21074/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+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//6020/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//21074 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//6020 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-etch.log b/testsuite/cdebootstrap/pdebuild-internal-etch.log
index cfcedb8..544d5bf 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-etch.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-etch.log
@@ -1,12 +1,12 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/15256/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/32425/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.10 2005/12/19 14:34:18 dancer Exp $
@@ -26,7 +26,7 @@ After unpacking 758kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   libdebian-installer4 libdebian-installer-extra4 cdebootstrap pbuilder
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 10991 files and directories currently installed.)
+(Reading database ... 11066 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.38_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.38_amd64.deb) ...
@@ -64,7 +64,7 @@ WARNING: The following packages cannot be authenticated!
   gettext-base libmagic1 file debconf-utils html2text gettext intltool-debian
   po-debconf debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package gettext-base.
-(Reading database ... 11088 files and directories currently installed.)
+(Reading database ... 11163 files and directories currently installed.)
 Unpacking gettext-base (from .../gettext-base_0.14.5-2_amd64.deb) ...
 Selecting previously deselected package libmagic1.
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
@@ -114,7 +114,7 @@ After unpacking 406kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 11758 files and directories currently installed.)
+(Reading database ... 11833 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.7_amd64.deb) ...
 Setting up fakeroot (1.5.7) ...
 
@@ -127,14 +127,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -323,18 +323,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 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; \
@@ -347,26 +347,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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -378,7 +378,6 @@ test to check that unknown parameter checking is right.
 PASS: tests/param-unknown.sh
 test1
 test2
-dsh: Process terminated (before write).
 PASS: tests/param-i.sh
 Check that cn4 option is working.
 PASS: tests/param-cn4.sh
@@ -417,7 +416,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
-Sat Feb 18 03:51:46 UTC 2006
+Wed Feb 22 03:41:06 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -487,7 +486,7 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sat Feb 18 03:51:51 UTC 2006
+Wed Feb 22 03:41:11 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -503,9 +502,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -515,58 +514,58 @@ dh_clean: Compatibility levels before 4 are deprecated.
 dh_installdirs
 dh_installdirs: Compatibility levels before 4 are deprecated.
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -605,6 +604,6 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/15256 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/32425 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-sarge.log b/testsuite/cdebootstrap/pdebuild-internal-sarge.log
index 5c49d8a..803ab3d 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-sarge.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-sarge.log
@@ -1,12 +1,12 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/13646/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/30909/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.10 2005/12/19 14:34:18 dancer Exp $
@@ -110,14 +110,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -305,18 +305,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 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; \
@@ -329,26 +329,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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -399,7 +399,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
-Sat Feb 18 03:40:16 UTC 2006
+Wed Feb 22 03:31:24 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -469,13 +469,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
-Sat Feb 18 03:40:21 UTC 2006
+Wed Feb 22 03:31:29 UTC 2006
 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).
+b: b
 a: a
 PASS: tests/segv-catcher.sh
 l w
@@ -485,9 +485,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -495,58 +495,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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
   done; \
 else \
   : ; \
 fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 done
-test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -570,6 +570,6 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/13646 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/30909 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-sid.log b/testsuite/cdebootstrap/pdebuild-internal-sid.log
index 9718dfc..250dc71 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-sid.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-sid.log
@@ -1,12 +1,12 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/21554/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/6424/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.10 2005/12/19 14:34:18 dancer Exp $
@@ -26,18 +26,18 @@ After unpacking 758kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   libdebian-installer4 libdebian-installer-extra4 cdebootstrap pbuilder
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 11017 files and directories currently installed.)
+(Reading database ... 11052 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.38_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.38_amd64.deb) ...
 Selecting previously deselected package cdebootstrap.
 Unpacking cdebootstrap (from .../cdebootstrap_0.3.10_amd64.deb) ...
 Selecting previously deselected package pbuilder.
-Unpacking pbuilder (from .../pbuilder_0.147_all.deb) ...
+Unpacking pbuilder (from .../pbuilder_0.148_all.deb) ...
 Setting up libdebian-installer4 (0.38) ...
 Setting up libdebian-installer-extra4 (0.38) ...
 Setting up cdebootstrap (0.3.10) ...
-Setting up pbuilder (0.147) ...
+Setting up pbuilder (0.148) ...
 Setting DEBBUILDOPTS=
  -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.23 2006/02/11 13:17:04 dancer Exp $
  -> Considering  debhelper (>> 3.0.0)
@@ -64,7 +64,7 @@ WARNING: The following packages cannot be authenticated!
   gettext-base libmagic1 file debconf-utils html2text gettext intltool-debian
   po-debconf debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package gettext-base.
-(Reading database ... 11114 files and directories currently installed.)
+(Reading database ... 11149 files and directories currently installed.)
 Unpacking gettext-base (from .../gettext-base_0.14.5-2_amd64.deb) ...
 Selecting previously deselected package libmagic1.
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
@@ -114,7 +114,7 @@ After unpacking 406kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 11784 files and directories currently installed.)
+(Reading database ... 11819 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.7_amd64.deb) ...
 Setting up fakeroot (1.5.7) ...
 
@@ -127,14 +127,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -323,18 +323,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 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; \
@@ -347,26 +347,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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -378,6 +378,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
@@ -416,7 +417,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
-Sat Feb 18 03:33:44 UTC 2006
+Wed Feb 22 03:25:56 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -486,13 +487,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
-Sat Feb 18 03:33:49 UTC 2006
+Wed Feb 22 03:26:01 UTC 2006
 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
+dsh: Process terminated (before write).
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -502,9 +503,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -514,58 +515,58 @@ dh_clean: Compatibility levels before 4 are deprecated.
 dh_installdirs
 dh_installdirs: Compatibility levels before 4 are deprecated.
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -604,6 +605,6 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/21554 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/6424 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-etch.log b/testsuite/cdebootstrap/pdebuild-normal-etch.log
index 0bc9d4a..bd5ea65 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-etch.log
+++ b/testsuite/cdebootstrap/pdebuild-normal-etch.log
@@ -6,14 +6,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -31,14 +31,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Feb 18 12:49:45 JST 2006
-pbuilder-time-stamp: 1140234585
+Current time: Wed Feb 22 12:39:23 JST 2006
+pbuilder-time-stamp: 1140579563
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/8250/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/25427/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -69,7 +69,7 @@ WARNING: The following packages cannot be authenticated!
   gettext-base libmagic1 file debconf-utils html2text gettext intltool-debian
   po-debconf debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package gettext-base.
-(Reading database ... 10991 files and directories currently installed.)
+(Reading database ... 11066 files and directories currently installed.)
 Unpacking gettext-base (from .../gettext-base_0.14.5-2_amd64.deb) ...
 Selecting previously deselected package libmagic1.
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
@@ -119,13 +119,13 @@ After unpacking 406kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 11661 files and directories currently installed.)
+(Reading database ... 11736 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.7_amd64.deb) ...
 Setting up fakeroot (1.5.7) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/8250/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/8250/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/25427/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/25427/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -416,6 +416,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
@@ -439,10 +440,10 @@ success
 success
 success
 success
-a: dsh: Failed executing ./invalid-exec-file with llexec call
-b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+a: dsh: Failed executing ./invalid-exec-file with llexec call
+b: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -450,11 +451,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
-Sat Feb 18 03:50:40 UTC 2006
+Wed Feb 22 03:40:09 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -467,18 +468,6 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 DUMPing parameters passed to llexec
 [2] 
-3: Using sleep as the remote shell
-3: Show machine names on output
-3: Adding machine 5,4,3,2,1 to list
-3: Setting forklimit to 3 and wait_shell to 0
-3: DUMPing parameters passed to llexec
-3: [3] 
-Using sleep as the remote shell
-Show machine names on output
-Adding machine 5,4,3,2,1 to list
-Setting forklimit to 3 and wait_shell to 0
-DUMPing parameters passed to llexec
-[3] 
 1: Using sleep as the remote shell
 1: Show machine names on output
 1: Adding machine 5,4,3,2,1 to list
@@ -493,6 +482,18 @@ Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 DUMPing parameters passed to llexec
 [1] 
+3: Using sleep as the remote shell
+3: Show machine names on output
+3: Adding machine 5,4,3,2,1 to list
+3: Setting forklimit to 3 and wait_shell to 0
+3: DUMPing parameters passed to llexec
+3: [3] 
+Using sleep as the remote shell
+Show machine names on output
+Adding machine 5,4,3,2,1 to list
+Setting forklimit to 3 and wait_shell to 0
+DUMPing parameters passed to llexec
+[3] 
 4: Using sleep as the remote shell
 4: Show machine names on output
 4: Adding machine 5,4,3,2,1 to list
@@ -524,7 +525,7 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sat Feb 18 03:50:45 UTC 2006
+Wed Feb 22 03:40:14 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -654,7 +655,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Feb 18 12:50:47 JST 2006
-pbuilder-time-stamp: 1140234647
+Current time: Wed Feb 22 12:40:16 JST 2006
+pbuilder-time-stamp: 1140579616
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/8250 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/25427 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-sarge.log b/testsuite/cdebootstrap/pdebuild-normal-sarge.log
index fdc9b0f..157046d 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-sarge.log
+++ b/testsuite/cdebootstrap/pdebuild-normal-sarge.log
@@ -6,14 +6,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -31,14 +31,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Feb 18 12:38:20 JST 2006
-pbuilder-time-stamp: 1140233900
+Current time: Wed Feb 22 12:29:50 JST 2006
+pbuilder-time-stamp: 1140578990
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/6672/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/23928/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -115,8 +115,8 @@ Unpacking fakeroot (from .../fakeroot_1.2.10_amd64.deb) ...
 Setting up fakeroot (1.2.10) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/6672/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/6672/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/23928/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/23928/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -427,8 +427,8 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
-c: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
+c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -441,7 +441,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
-Sat Feb 18 03:39:13 UTC 2006
+Wed Feb 22 03:30:30 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -511,13 +511,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
-Sat Feb 18 03:39:18 UTC 2006
+Wed Feb 22 03:30:35 UTC 2006
 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).
-b: b
 a: a
 PASS: tests/segv-catcher.sh
 l w
@@ -624,7 +624,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Feb 18 12:39:21 JST 2006
-pbuilder-time-stamp: 1140233961
+Current time: Wed Feb 22 12:30:40 JST 2006
+pbuilder-time-stamp: 1140579040
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/6672 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/23928 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-sid.log b/testsuite/cdebootstrap/pdebuild-normal-sid.log
index 71dedb6..8d258a4 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-sid.log
+++ b/testsuite/cdebootstrap/pdebuild-normal-sid.log
@@ -6,14 +6,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -31,14 +31,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Feb 18 12:31:16 JST 2006
-pbuilder-time-stamp: 1140233476
+Current time: Wed Feb 22 12:24:08 JST 2006
+pbuilder-time-stamp: 1140578648
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/14568/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/31766/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -69,7 +69,7 @@ WARNING: The following packages cannot be authenticated!
   gettext-base libmagic1 file debconf-utils html2text gettext intltool-debian
   po-debconf debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package gettext-base.
-(Reading database ... 11017 files and directories currently installed.)
+(Reading database ... 11052 files and directories currently installed.)
 Unpacking gettext-base (from .../gettext-base_0.14.5-2_amd64.deb) ...
 Selecting previously deselected package libmagic1.
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
@@ -119,13 +119,13 @@ After unpacking 406kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 11687 files and directories currently installed.)
+(Reading database ... 11722 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.7_amd64.deb) ...
 Setting up fakeroot (1.5.7) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/14568/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/14568/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/31766/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/31766/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -442,8 +442,8 @@ success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
+d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -455,7 +455,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
-Sat Feb 18 03:32:33 UTC 2006
+Wed Feb 22 03:24:54 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -525,14 +525,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
-Sat Feb 18 03:32:38 UTC 2006
+Wed Feb 22 03:24:59 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
+dsh: Process terminated (before write).
 b: b
 c: c
-dsh: Process terminated (before write).
-a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -655,7 +655,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Feb 18 12:32:41 JST 2006
-pbuilder-time-stamp: 1140233561
+Current time: Wed Feb 22 12:25:01 JST 2006
+pbuilder-time-stamp: 1140578701
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/14568 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/31766 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-etch.log b/testsuite/normal/pbuilder-build-dsh-etch.log
index b9db8ce..f1d15d1 100644
--- a/testsuite/normal/pbuilder-build-dsh-etch.log
+++ b/testsuite/normal/pbuilder-build-dsh-etch.log
@@ -2,14 +2,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Feb 18 12:20:18 JST 2006
-pbuilder-time-stamp: 1140232818
+Current time: Wed Feb 22 12:16:07 JST 2006
+pbuilder-time-stamp: 1140578167
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/9907/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/27343/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -37,7 +37,7 @@ The following NEW packages will be installed:
 Need to get 0B/2932kB of archives.
 After unpacking 9728kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11150 files and directories currently installed.)
+(Reading database ... 11225 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -81,17 +81,17 @@ The following NEW packages will be installed:
 Need to get 0B/97.9kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11760 files and directories currently installed.)
+(Reading database ... 11835 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.7_amd64.deb) ...
 Setting up fakeroot (1.5.7) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/9907/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/9907/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/27343/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/27343/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -417,7 +417,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
-Sat Feb 18 03:21:10 UTC 2006
+Wed Feb 22 03:16:47 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -487,7 +487,7 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sat Feb 18 03:21:15 UTC 2006
+Wed Feb 22 03:16:52 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -617,7 +617,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Feb 18 12:21:18 JST 2006
-pbuilder-time-stamp: 1140232878
+Current time: Wed Feb 22 12:16:54 JST 2006
+pbuilder-time-stamp: 1140578214
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/9907 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/27343 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-sarge.log b/testsuite/normal/pbuilder-build-dsh-sarge.log
index bafa584..b620097 100644
--- a/testsuite/normal/pbuilder-build-dsh-sarge.log
+++ b/testsuite/normal/pbuilder-build-dsh-sarge.log
@@ -2,14 +2,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Feb 18 12:09:20 JST 2006
-pbuilder-time-stamp: 1140232160
+Current time: Wed Feb 22 12:07:37 JST 2006
+pbuilder-time-stamp: 1140577657
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/5260/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/22853/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -86,12 +86,12 @@ Unpacking fakeroot (from .../fakeroot_1.2.10_amd64.deb) ...
 Setting up fakeroot (1.2.10) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/5260/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/5260/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/22853/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/22853/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -409,7 +409,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
-Sat Feb 18 03:10:12 UTC 2006
+Wed Feb 22 03:08:11 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -479,14 +479,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
-Sat Feb 18 03:10:17 UTC 2006
+Wed Feb 22 03:08:16 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
 b: b
-c: c
 dsh: Process terminated (before write).
-a: a
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -592,7 +592,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Feb 18 12:10:20 JST 2006
-pbuilder-time-stamp: 1140232220
+Current time: Wed Feb 22 12:08:18 JST 2006
+pbuilder-time-stamp: 1140577698
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/5260 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/22853 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-sid.log b/testsuite/normal/pbuilder-build-dsh-sid.log
index 14eaff5..1004168 100644
--- a/testsuite/normal/pbuilder-build-dsh-sid.log
+++ b/testsuite/normal/pbuilder-build-dsh-sid.log
@@ -2,14 +2,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Feb 18 12:02:49 JST 2006
-pbuilder-time-stamp: 1140231769
+Current time: Wed Feb 22 12:02:22 JST 2006
+pbuilder-time-stamp: 1140577342
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/7104/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/24646/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -37,7 +37,7 @@ The following NEW packages will be installed:
 Need to get 0B/2932kB of archives.
 After unpacking 9728kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11177 files and directories currently installed.)
+(Reading database ... 11212 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -81,17 +81,17 @@ The following NEW packages will be installed:
 Need to get 0B/97.9kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11787 files and directories currently installed.)
+(Reading database ... 11822 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.7_amd64.deb) ...
 Setting up fakeroot (1.5.7) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/7104/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/7104/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/24646/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/24646/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -378,6 +378,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
@@ -416,7 +417,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
-Sat Feb 18 03:03:43 UTC 2006
+Wed Feb 22 03:03:12 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -486,13 +487,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
-Sat Feb 18 03:03:48 UTC 2006
+Wed Feb 22 03:03:17 UTC 2006
 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
+dsh: Process terminated (before write).
+a: a
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -616,7 +617,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Feb 18 12:03:51 JST 2006
-pbuilder-time-stamp: 1140231831
+Current time: Wed Feb 22 12:03:19 JST 2006
+pbuilder-time-stamp: 1140577399
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir1/7104 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir1/24646 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-etch.log b/testsuite/normal/pbuilder-create-etch.log
index b269073..46dba20 100644
--- a/testsuite/normal/pbuilder-create-etch.log
+++ b/testsuite/normal/pbuilder-create-etch.log
@@ -217,6 +217,8 @@ I: Retrieving passwd
 I: Validating passwd
 I: Retrieving perl-base
 I: Validating perl-base
+I: Retrieving procps
+I: Validating procps
 I: Retrieving readline-common
 I: Validating readline-common
 I: Retrieving sed
@@ -294,6 +296,7 @@ I: Extracting ncurses-base...
 I: Extracting ncurses-bin...
 I: Extracting passwd...
 I: Extracting perl-base...
+I: Extracting procps...
 I: Extracting sed...
 I: Extracting sysv-rc...
 I: Extracting sysvinit...
@@ -353,6 +356,7 @@ I: Unpacking ncurses-base...
 I: Unpacking ncurses-bin...
 I: Unpacking passwd...
 I: Unpacking perl-base...
+I: Unpacking procps...
 I: Unpacking sed...
 I: Unpacking sysv-rc...
 I: Unpacking sysvinit...
@@ -399,6 +403,7 @@ I: Configuring libtext-wrapi18n-perl...
 I: Configuring coreutils...
 I: Configuring debianutils...
 I: Configuring makedev...
+I: Configuring procps...
 I: Configuring ncurses-base...
 I: Configuring ncurses-bin...
 I: Configuring libpam-modules...
@@ -412,8 +417,8 @@ I: Configuring bash...
 I: Configuring login...
 I: Configuring lsb-base...
 I: Configuring passwd...
-I: Configuring util-linux...
 I: Configuring initscripts...
+I: Configuring util-linux...
 I: Configuring sysvinit...
 I: Configuring debconf-i18n...
 I: Configuring debconf...
@@ -552,17 +557,17 @@ umount: /dev/shm: not mounted
 umount: proc: not mounted
 umount: proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//1810/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//19238/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//1810/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//19238/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> installing dummy policy-rc.d
 Get:1 http://ftp.jp.debian.org etch Release.gpg [189B]
 Hit http://ftp.jp.debian.org etch Release
 Hit http://ftp.jp.debian.org etch/main Packages
-Fetched 189B in 0s (1690B/s)
+Fetched 189B in 0s (3067B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -590,7 +595,7 @@ The following NEW packages will be installed:
 Need to get 0B/20.7MB of archives.
 After unpacking 82.9MB of additional disk space will be used.
 Selecting previously deselected package binutils.
-(Reading database ... 6764 files and directories currently installed.)
+(Reading database ... 6839 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.16.1cvs20060117-1_amd64.deb) ...
 Selecting previously deselected package cpp-4.0.
 Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-8_amd64.deb) ...
@@ -651,9 +656,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: 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//1810/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//19238/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//1810 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//19238 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-sarge.log b/testsuite/normal/pbuilder-create-sarge.log
index 2684b8a..51e4365 100644
--- a/testsuite/normal/pbuilder-create-sarge.log
+++ b/testsuite/normal/pbuilder-create-sarge.log
@@ -330,16 +330,16 @@ umount: /dev/shm: not mounted
 umount: proc: not mounted
 umount: proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//28718/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//13969/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//28718/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//13969/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> installing dummy policy-rc.d
 Hit http://ftp.jp.debian.org sarge/main Packages
 Get:1 http://ftp.jp.debian.org sarge/main Release [110B]
-Fetched 110B in 0s (3704B/s)
+Fetched 110B in 0s (1625B/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -426,9 +426,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] [pid | job]... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//28718/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//13969/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//28718 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//13969 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-sid.log b/testsuite/normal/pbuilder-create-sid.log
index 0262c87..10733d5 100644
--- a/testsuite/normal/pbuilder-create-sid.log
+++ b/testsuite/normal/pbuilder-create-sid.log
@@ -557,17 +557,17 @@ umount: /dev/shm: not mounted
 umount: proc: not mounted
 umount: proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//31322/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//16523/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//31322/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//16523/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> installing dummy policy-rc.d
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Hit http://ftp.jp.debian.org sid Release
 Hit http://ftp.jp.debian.org sid/main Packages
-Fetched 189B in 0s (1687B/s)
+Fetched 189B in 0s (1846B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -592,10 +592,12 @@ The following NEW packages will be installed:
   libc6-dev libdb4.4 libstdc++6-4.0-dev linux-kernel-headers make patch perl
   perl-modules
 0 upgraded, 17 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/21.2MB of archives.
+Need to get 479kB/21.2MB of archives.
 After unpacking 84.1MB of additional disk space will be used.
+Get:1 http://ftp.jp.debian.org sid/main libdb4.4 4.4.20-2 [479kB]
+Fetched 479kB in 0s (1337kB/s)
 Selecting previously deselected package binutils.
-(Reading database ... 6792 files and directories currently installed.)
+(Reading database ... 6827 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.16.1cvs20060117-1_amd64.deb) ...
 Selecting previously deselected package cpp-4.0.
 Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-9_amd64.deb) ...
@@ -604,7 +606,7 @@ Unpacking cpp (from .../cpp_4%3a4.0.2-2_amd64.deb) ...
 Selecting previously deselected package perl-modules.
 Unpacking perl-modules (from .../perl-modules_5.8.8-2_all.deb) ...
 Selecting previously deselected package libdb4.4.
-Unpacking libdb4.4 (from .../libdb4.4_4.4.20-1_amd64.deb) ...
+Unpacking libdb4.4 (from .../libdb4.4_4.4.20-2_amd64.deb) ...
 Selecting previously deselected package perl.
 Unpacking perl (from .../perl_5.8.8-2_amd64.deb) ...
 Selecting previously deselected package patch.
@@ -612,7 +614,7 @@ Unpacking patch (from .../patch_2.5.9-4_amd64.deb) ...
 Selecting previously deselected package make.
 Unpacking make (from .../make_3.80+3.81.b4-1_amd64.deb) ...
 Selecting previously deselected package dpkg-dev.
-Unpacking dpkg-dev (from .../dpkg-dev_1.13.15_all.deb) ...
+Unpacking dpkg-dev (from .../dpkg-dev_1.13.16_all.deb) ...
 Selecting previously deselected package gcc-4.0.
 Unpacking gcc-4.0 (from .../gcc-4.0_4.0.2-9_amd64.deb) ...
 Selecting previously deselected package gcc.
@@ -634,7 +636,7 @@ Setting up binutils (2.16.1cvs20060117-1) ...
 Setting up cpp-4.0 (4.0.2-9) ...
 Setting up cpp (4.0.2-2) ...
 
-Setting up libdb4.4 (4.4.20-1) ...
+Setting up libdb4.4 (4.4.20-2) ...
 Setting up patch (2.5.9-4) ...
 Setting up make (3.80+3.81.b4-1) ...
 
@@ -647,21 +649,22 @@ Setting up perl-modules (5.8.8-2) ...
 Setting up libstdc++6-4.0-dev (4.0.2-9) ...
 Setting up perl (5.8.8-2) ...
 
-Setting up dpkg-dev (1.13.15) ...
+Setting up dpkg-dev (1.13.16) ...
 Setting up g++-4.0 (4.0.2-9) ...
 Setting up g++ (4.0.2-2) ...
 
 Setting up build-essential (11.2) ...
 Copying back the cached apt archive contents
+ -> new cache content libdb4.4_4.4.20-2_amd64.deb added
 umount: /sys: not mounted
 umount: /run: not found
 umount: /proc/bus/usb: not mounted
 umount: /dev/shm: 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//31322/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//16523/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//31322 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//16523 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-etch.log b/testsuite/normal/pbuilder-execute-etch.log
index dd85cf8..d7bd300 100644
--- a/testsuite/normal/pbuilder-execute-etch.log
+++ b/testsuite/normal/pbuilder-execute-etch.log
@@ -1,9 +1,9 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//30597/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//15708/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
@@ -13,4 +13,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//30597 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//15708 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-sarge.log b/testsuite/normal/pbuilder-execute-sarge.log
index 11b8d15..51cc770 100644
--- a/testsuite/normal/pbuilder-execute-sarge.log
+++ b/testsuite/normal/pbuilder-execute-sarge.log
@@ -1,9 +1,9 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//25909/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//11176/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
@@ -13,4 +13,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//25909 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//11176 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-sid.log b/testsuite/normal/pbuilder-execute-sid.log
index 6a57c5c..19fa725 100644
--- a/testsuite/normal/pbuilder-execute-sid.log
+++ b/testsuite/normal/pbuilder-execute-sid.log
@@ -1,9 +1,9 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//27762/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//13005/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
@@ -13,4 +13,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//27762 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//13005 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-etch-sid-experimental.log b/testsuite/normal/pbuilder-update-etch-sid-experimental.log
index ff6e5f2..01df3a2 100644
--- a/testsuite/normal/pbuilder-update-etch-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-etch-sid-experimental.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//922/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//18326/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -16,8 +16,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 [4245B]
 Hit http://ftp.jp.debian.org sid/main Packages
-Get:4 http://ftp.jp.debian.org experimental/main Packages [126kB]
-Fetched 130kB in 0s (329kB/s)
+Get:4 http://ftp.jp.debian.org experimental/main Packages [117kB]
+Fetched 121kB in 0s (255kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -34,31 +34,31 @@ The following packages will be upgraded:
 6 upgraded, 2 newly installed, 1 to remove and 2 not upgraded.
 Need to get 0B/3640kB of archives.
 After unpacking 569kB of additional disk space will be used.
-(Reading database ... 11128 files and directories currently installed.)
+(Reading database ... 11212 files and directories currently installed.)
 Preparing to replace whiptail 0.51.6-31 (using .../whiptail_0.52.2-1_amd64.deb) ...
 Unpacking replacement whiptail ...
-(Reading database ... 11127 files and directories currently installed.)
+(Reading database ... 11211 files and directories currently installed.)
 Removing libnewt0.51 ...
 Selecting previously deselected package libnewt0.52.
-(Reading database ... 11062 files and directories currently installed.)
+(Reading database ... 11146 files and directories currently installed.)
 Unpacking libnewt0.52 (from .../libnewt0.52_0.52.2-1_amd64.deb) ...
 Preparing to replace diff 2.8.1-11 (using .../diff_2.8.7-0.2_amd64.deb) ...
 Unpacking replacement diff ...
 Setting up diff (2.8.7-0.2) ...
 Selecting previously deselected package gcc-4.1-base.
-(Reading database ... 11134 files and directories currently installed.)
+(Reading database ... 11218 files and directories currently installed.)
 Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1-0exp7_amd64.deb) ...
 Preparing to replace libgcc1 1:4.0.2-9 (using .../libgcc1_1%3a4.1-0exp7_amd64.deb) ...
 Unpacking replacement libgcc1 ...
 Setting up gcc-4.1-base (4.1-0exp7) ...
 Setting up libgcc1 (4.1-0exp7) ...
 
-(Reading database ... 11140 files and directories currently installed.)
+(Reading database ... 11224 files and directories currently installed.)
 Preparing to replace libstdc++6 4.0.2-9 (using .../libstdc++6_4.1-0exp7_amd64.deb) ...
 Unpacking replacement libstdc++6 ...
 Setting up libstdc++6 (4.1-0exp7) ...
 
-(Reading database ... 11140 files and directories currently installed.)
+(Reading database ... 11224 files and directories currently installed.)
 Preparing to replace aptitude 0.4.1-1 (using .../aptitude_0.4.1-1experimental1_amd64.deb) ...
 Unpacking replacement aptitude ...
 Preparing to replace gettext-base 0.14.5-2 (using .../gettext-base_0.14.5-2.csharp.1_amd64.deb) ...
@@ -87,10 +87,10 @@ The following packages will be upgraded:
 2 upgraded, 0 newly installed, 2 to remove and 0 not upgraded.
 Need to get 0B/1501kB of archives.
 After unpacking 9462kB disk space will be freed.
-(Reading database ... 11140 files and directories currently installed.)
+(Reading database ... 11224 files and directories currently installed.)
 Removing tasksel ...
 Removing aptitude ...
-(Reading database ... 10948 files and directories currently installed.)
+(Reading database ... 11032 files and directories currently installed.)
 Preparing to replace apt-utils 0.6.43.2 (using .../apt-utils_0.6.43.2exp1_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Preparing to replace apt 0.6.43.2 (using .../apt_0.6.43.2exp1_amd64.deb) ...
@@ -106,9 +106,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: 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//922/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//18326/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//922 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//18326 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-etch-sid.log b/testsuite/normal/pbuilder-update-etch-sid.log
index 4ab8d93..375e0c1 100644
--- a/testsuite/normal/pbuilder-update-etch-sid.log
+++ b/testsuite/normal/pbuilder-update-etch-sid.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//31554/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//16684/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -12,8 +12,8 @@ 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 [5722B]
-Get:3 http://ftp.jp.debian.org sid/main Packages [3926kB]
-Fetched 3932kB in 2s (1340kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [3933kB]
+Fetched 3939kB in 2s (1901kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -23,108 +23,56 @@ The following NEW packages will be installed:
   libdb4.4
 The following packages will be upgraded:
   adduser coreutils cpp-4.0 dmidecode dpkg dpkg-dev dselect g++-4.0 gcc-4.0
-  gcc-4.0-base initscripts klogd libc6 libc6-dev libgcc1 libpam-modules
-  libpam-runtime libpam0g libreadline5 libselinux1 libstdc++6
-  libstdc++6-4.0-dev login modutils nano netkit-inetd passwd perl perl-base
-  perl-modules readline-common sed sysklogd sysv-rc sysvinit
-35 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/30.9MB of archives.
-After unpacking 1901kB of additional disk space will be used.
-(Reading database ... 11150 files and directories currently installed.)
-Preparing to replace dpkg 1.13.13 (using .../dpkg_1.13.15_amd64.deb) ...
+  gcc-4.0-base klogd libc6 libc6-dev libgcc1 libstdc++6 libstdc++6-4.0-dev
+  login modutils passwd perl perl-base perl-modules procps sed sysklogd
+25 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Need to get 0B/29.7MB of archives.
+After unpacking 1954kB of additional disk space will be used.
+(Reading database ... 11225 files and directories currently installed.)
+Preparing to replace dpkg 1.13.13 (using .../dpkg_1.13.16_amd64.deb) ...
 Unpacking replacement dpkg ...
-Setting up dpkg (1.13.15) ...
+Setting up dpkg (1.13.16) ...
 
-(Reading database ... 11125 files and directories currently installed.)
+(Reading database ... 11201 files and directories currently installed.)
 Preparing to replace coreutils 5.2.1-2.1 (using .../coreutils_5.93-5_amd64.deb) ...
 Removing `local diversion of /usr/share/man/man1/md5sum.textutils.1.gz to /usr/share/man/man1/md5sum.1.gz'
 No diversion `any diversion of /usr/bin/md5sum.textutils', none removed
 Unpacking replacement coreutils ...
 Setting up coreutils (5.93-5) ...
 
-(Reading database ... 11140 files and directories currently installed.)
+(Reading database ... 11216 files and directories currently installed.)
+Preparing to replace login 1:4.0.14-4 (using .../login_1%3a4.0.14-6_amd64.deb) ...
+Unpacking replacement login ...
+Setting up login (4.0.14-6) ...
+Installing new version of config file /etc/login.defs ...
+
+(Reading database ... 11216 files and directories currently installed.)
+Preparing to replace perl-modules 5.8.7-10 (using .../perl-modules_5.8.8-2_all.deb) ...
+Unpacking replacement perl-modules ...
 Preparing to replace libc6-dev 2.3.5-13 (using .../libc6-dev_2.3.6-1_amd64.deb) ...
 Unpacking replacement libc6-dev ...
 Preparing to replace libc6 2.3.5-13 (using .../libc6_2.3.6-1_amd64.deb) ...
 Unpacking replacement libc6 ...
 Setting up libc6 (2.3.6-1) ...
 Current default timezone: 'UTC'.
-Local time is now:      Sat Feb 18 03:25:03 UTC 2006.
-Universal Time is now:  Sat Feb 18 03:25:03 UTC 2006.
+Local time is now:      Wed Feb 22 03:19:36 UTC 2006.
+Universal Time is now:  Wed Feb 22 03:19:36 UTC 2006.
 Run 'tzconfig' if you wish to change it.
 
-(Reading database ... 11113 files and directories currently installed.)
-Preparing to replace libpam-runtime 0.79-3 (using .../libpam-runtime_0.79-3.1_all.deb) ...
-Unpacking replacement libpam-runtime ...
-Setting up libpam-runtime (0.79-3.1) ...
-
-(Reading database ... 11113 files and directories currently installed.)
-Preparing to replace libpam0g 0.79-3 (using .../libpam0g_0.79-3.1_amd64.deb) ...
-Unpacking replacement libpam0g ...
-Setting up libpam0g (0.79-3.1) ...
-
-(Reading database ... 11113 files and directories currently installed.)
-Preparing to replace libselinux1 1.28-2 (using .../libselinux1_1.28-4_amd64.deb) ...
-Unpacking replacement libselinux1 ...
-Setting up libselinux1 (1.28-4) ...
-
-(Reading database ... 11113 files and directories currently installed.)
-Preparing to replace libpam-modules 0.79-3 (using .../libpam-modules_0.79-3.1_amd64.deb) ...
-Unpacking replacement libpam-modules ...
-Setting up libpam-modules (0.79-3.1) ...
-
-(Reading database ... 11113 files and directories currently installed.)
-Preparing to replace login 1:4.0.14-4 (using .../login_1%3a4.0.14-6_amd64.deb) ...
-Unpacking replacement login ...
-Setting up login (4.0.14-6) ...
-Installing new version of config file /etc/login.defs ...
-
-(Reading database ... 11113 files and directories currently installed.)
-Preparing to replace perl-modules 5.8.7-10 (using .../perl-modules_5.8.8-2_all.deb) ...
-Unpacking replacement perl-modules ...
 Selecting previously deselected package libdb4.4.
-Unpacking libdb4.4 (from .../libdb4.4_4.4.20-1_amd64.deb) ...
+(Reading database ... 11200 files and directories currently installed.)
+Unpacking libdb4.4 (from .../libdb4.4_4.4.20-2_amd64.deb) ...
 Preparing to replace perl-base 5.8.7-10 (using .../perl-base_5.8.8-2_amd64.deb) ...
 Unpacking replacement perl-base ...
 Setting up perl-base (5.8.8-2) ...
-(Reading database ... 11122 files and directories currently installed.)
+(Reading database ... 11198 files and directories currently installed.)
 Preparing to replace perl 5.8.7-10 (using .../perl_5.8.8-2_amd64.deb) ...
 Unpacking replacement perl ...
 Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-5_amd64.deb) ...
 Unpacking replacement sed ...
 Setting up sed (4.1.4-5) ...
 
-(Reading database ... 11124 files and directories currently installed.)
-Preparing to replace sysvinit 2.86.ds1-4 (using .../sysvinit_2.86.ds1-12_amd64.deb) ...
-Unpacking replacement sysvinit ...
-Setting up sysvinit (2.86.ds1-12) ...
-init: timeout opening/writing control channel /dev/initctl
-
-(Reading database ... 11125 files and directories currently installed.)
-Preparing to replace initscripts 2.86.ds1-4 (using .../initscripts_2.86.ds1-12_amd64.deb) ...
-Unmodified conffile '/etc/init.d/bootclean.sh' obsolete; removed `/etc/init.d/bootclean.sh'
-Unpacking replacement initscripts ...
-Setting up initscripts (2.86.ds1-12) ...
-Installing new version of config file /etc/init.d/bootlogd ...
-Installing new version of config file /etc/init.d/bootmisc.sh ...
-Installing new version of config file /etc/init.d/checkfs.sh ...
-Installing new version of config file /etc/init.d/checkroot.sh ...
-Installing new version of config file /etc/init.d/halt ...
-Installing new version of config file /etc/init.d/hostname.sh ...
-Installing new version of config file /etc/init.d/mountall.sh ...
-Installing new version of config file /etc/init.d/mountnfs.sh ...
-Installing new version of config file /etc/init.d/mountvirtfs ...
-Installing new version of config file /etc/init.d/reboot ...
-Installing new version of config file /etc/init.d/rmnologin ...
-Installing new version of config file /etc/init.d/sendsigs ...
-Installing new version of config file /etc/init.d/single ...
-Installing new version of config file /etc/init.d/umountfs ...
-Installing new version of config file /etc/init.d/umountnfs.sh ...
-Installing new version of config file /etc/init.d/umountroot ...
-Installing new version of config file /etc/init.d/urandom ...
-Installing new version of config file /etc/default/tmpfs ...
-
-(Reading database ... 11139 files and directories currently installed.)
+(Reading database ... 11200 files and directories currently installed.)
 Preparing to replace cpp-4.0 4.0.2-8 (using .../cpp-4.0_4.0.2-9_amd64.deb) ...
 Unpacking replacement cpp-4.0 ...
 Preparing to replace gcc-4.0-base 4.0.2-8 (using .../gcc-4.0-base_4.0.2-9_amd64.deb) ...
@@ -134,7 +82,7 @@ Unpacking replacement libgcc1 ...
 Setting up gcc-4.0-base (4.0.2-9) ...
 Setting up libgcc1 (4.0.2-9) ...
 
-(Reading database ... 11139 files and directories currently installed.)
+(Reading database ... 11200 files and directories currently installed.)
 Preparing to replace gcc-4.0 4.0.2-8 (using .../gcc-4.0_4.0.2-9_amd64.deb) ...
 Unpacking replacement gcc-4.0 ...
 Preparing to replace g++-4.0 4.0.2-8 (using .../g++-4.0_4.0.2-9_amd64.deb) ...
@@ -145,15 +93,10 @@ Preparing to replace libstdc++6 4.0.2-8 (using .../libstdc++6_4.0.2-9_amd64.deb)
 Unpacking replacement libstdc++6 ...
 Setting up libstdc++6 (4.0.2-9) ...
 
-(Reading database ... 11139 files and directories currently installed.)
-Preparing to replace sysv-rc 2.86.ds1-4 (using .../sysv-rc_2.86.ds1-12_all.deb) ...
-Unpacking replacement sysv-rc ...
-Setting up sysv-rc (2.86.ds1-12) ...
-
-(Reading database ... 11149 files and directories currently installed.)
+(Reading database ... 11200 files and directories currently installed.)
 Preparing to replace passwd 1:4.0.14-4 (using .../passwd_1%3a4.0.14-6_amd64.deb) ...
 Unpacking replacement passwd ...
-Preparing to replace adduser 3.80 (using .../archives/adduser_3.83_all.deb) ...
+Preparing to replace adduser 3.80 (using .../archives/adduser_3.84_all.deb) ...
 Unpacking replacement adduser ...
 Preparing to replace dmidecode 2.7-2 (using .../dmidecode_2.8-1_amd64.deb) ...
 Unpacking replacement dmidecode ...
@@ -163,40 +106,31 @@ Preparing to replace klogd 1.4.1-17 (using .../klogd_1.4.1-17.1_amd64.deb) ...
 Unpacking replacement klogd ...
 Preparing to replace modutils 2.4.27.0-3 (using .../modutils_2.4.27.0-4_amd64.deb) ...
 Unpacking replacement modutils ...
-Preparing to replace nano 1.3.10-1 (using .../nano_1.3.10-2_amd64.deb) ...
-Unpacking replacement nano ...
-Preparing to replace netkit-inetd 0.10-10.2 (using .../netkit-inetd_0.10-10.3_amd64.deb) ...
-Unpacking replacement netkit-inetd ...
-Preparing to replace dselect 1.13.13 (using .../dselect_1.13.15_amd64.deb) ...
+Preparing to replace dselect 1.13.13 (using .../dselect_1.13.16_amd64.deb) ...
 Unpacking replacement dselect ...
-Preparing to replace dpkg-dev 1.13.13 (using .../dpkg-dev_1.13.15_all.deb) ...
+Preparing to replace procps 1:3.2.5-1 (using .../procps_1%3a3.2.6-2_amd64.deb) ...
+Unpacking replacement procps ...
+Preparing to replace dpkg-dev 1.13.13 (using .../dpkg-dev_1.13.16_all.deb) ...
 Unpacking replacement dpkg-dev ...
-Preparing to replace readline-common 5.1-5 (using .../readline-common_5.1-6_all.deb) ...
-Unpacking replacement readline-common ...
-Preparing to replace libreadline5 5.1-5 (using .../libreadline5_5.1-6_amd64.deb) ...
-Unpacking replacement libreadline5 ...
+Setting up libdb4.4 (4.4.20-2) ...
 Setting up libc6-dev (2.3.6-1) ...
-Setting up libdb4.4 (4.4.20-1) ...
 Setting up cpp-4.0 (4.0.2-9) ...
 Setting up gcc-4.0 (4.0.2-9) ...
 Setting up passwd (4.0.14-6) ...
 
-Setting up adduser (3.83) ...
+Setting up adduser (3.84) ...
 Installing new version of config file /etc/deluser.conf ...
 
 Setting up dmidecode (2.8-1) ...
 Setting up modutils (2.4.27.0-4) ...
 Architecture-specific modutils configuration for x86_64 not found, using defaults
 
-Setting up nano (1.3.10-2) ...
-
-Setting up netkit-inetd (0.10-10.3) ...
-
-Setting up dselect (1.13.15) ...
-Setting up readline-common (5.1-6) ...
-
-Setting up libreadline5 (5.1-6) ...
+Setting up dselect (1.13.16) ...
+Setting up procps (3.2.6-2) ...
+Installing new version of config file /etc/init.d/procps.sh ...
+Installing new version of config file /etc/sysctl.conf ...
 
+Setting up g++-4.0 (4.0.2-9) ...
 Setting up klogd (1.4.1-17.1) ...
 Installing new version of config file /etc/init.d/klogd ...
 Stopping kernel log daemon: klogd.
@@ -205,10 +139,9 @@ Setting up sysklogd (1.4.1-17.1) ...
 
 Setting up perl-modules (5.8.8-2) ...
 Setting up libstdc++6-4.0-dev (4.0.2-9) ...
-Setting up g++-4.0 (4.0.2-9) ...
 Setting up perl (5.8.8-2) ...
 
-Setting up dpkg-dev (1.13.15) ...
+Setting up dpkg-dev (1.13.16) ...
 Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
@@ -222,9 +155,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: 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//31554/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//16684/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//31554 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//16684 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-sarge-etch-sid-experimental.log b/testsuite/normal/pbuilder-update-sarge-etch-sid-experimental.log
index 58353c9..e132d4e 100644
--- a/testsuite/normal/pbuilder-update-sarge-etch-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-sarge-etch-sid-experimental.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//644/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//18068/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -18,9 +18,9 @@ Get:3 http://ftp.jp.debian.org experimental Release [4245B]
 Ign http://ftp.jp.debian.org experimental Release
 Get:4 http://ftp.jp.debian.org sid Release [5722B]
 Ign http://ftp.jp.debian.org sid Release
-Get:5 http://ftp.jp.debian.org experimental/main Packages [126kB]
+Get:5 http://ftp.jp.debian.org experimental/main Packages [117kB]
 Hit http://ftp.jp.debian.org sid/main Packages
-Fetched 136kB in 0s (367kB/s)
+Fetched 127kB in 0s (630kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org experimental Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
@@ -43,31 +43,31 @@ After unpacking 1610kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   whiptail libnewt0.52 diff gcc-4.1-base libgcc1 libstdc++6 aptitude
   gettext-base console-data
-(Reading database ... 12515 files and directories currently installed.)
+(Reading database ... 12550 files and directories currently installed.)
 Preparing to replace whiptail 0.51.6-31 (using .../whiptail_0.52.2-1_amd64.deb) ...
 Unpacking replacement whiptail ...
-(Reading database ... 12514 files and directories currently installed.)
+(Reading database ... 12549 files and directories currently installed.)
 Removing libnewt0.51 ...
 Selecting previously deselected package libnewt0.52.
-(Reading database ... 12449 files and directories currently installed.)
+(Reading database ... 12484 files and directories currently installed.)
 Unpacking libnewt0.52 (from .../libnewt0.52_0.52.2-1_amd64.deb) ...
 Preparing to replace diff 2.8.1-11 (using .../diff_2.8.7-0.2_amd64.deb) ...
 Unpacking replacement diff ...
 Setting up diff (2.8.7-0.2) ...
 Selecting previously deselected package gcc-4.1-base.
-(Reading database ... 12521 files and directories currently installed.)
+(Reading database ... 12556 files and directories currently installed.)
 Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1-0exp7_amd64.deb) ...
 Preparing to replace libgcc1 1:4.0.2-9 (using .../libgcc1_1%3a4.1-0exp7_amd64.deb) ...
 Unpacking replacement libgcc1 ...
 Setting up gcc-4.1-base (4.1-0exp7) ...
 Setting up libgcc1 (4.1-0exp7) ...
 
-(Reading database ... 12527 files and directories currently installed.)
+(Reading database ... 12562 files and directories currently installed.)
 Preparing to replace libstdc++6 4.0.2-9 (using .../libstdc++6_4.1-0exp7_amd64.deb) ...
 Unpacking replacement libstdc++6 ...
 Setting up libstdc++6 (4.1-0exp7) ...
 
-(Reading database ... 12527 files and directories currently installed.)
+(Reading database ... 12562 files and directories currently installed.)
 Preparing to replace aptitude 0.4.1-1 (using .../aptitude_0.4.1-1experimental1_amd64.deb) ...
 Unpacking replacement aptitude ...
 Preparing to replace gettext-base 0.14.5-2 (using .../gettext-base_0.14.5-2.csharp.1_amd64.deb) ...
@@ -104,10 +104,10 @@ Need to get 0B/1501kB of archives.
 After unpacking 9462kB disk space will be freed.
 WARNING: The following packages cannot be authenticated!
   apt-utils apt
-(Reading database ... 12498 files and directories currently installed.)
+(Reading database ... 12533 files and directories currently installed.)
 Removing tasksel ...
 Removing aptitude ...
-(Reading database ... 12306 files and directories currently installed.)
+(Reading database ... 12341 files and directories currently installed.)
 Preparing to replace apt-utils 0.6.43.2 (using .../apt-utils_0.6.43.2exp1_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Preparing to replace apt 0.6.43.2 (using .../apt_0.6.43.2exp1_amd64.deb) ...
@@ -121,10 +121,11 @@ umount: /sys: not mounted
 umount: /run: not found
 umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
-tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh: line 14: kill: (29913) - No such process
- -> user script /var/cache/pbuilder/build//644/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+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//18068/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//644 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//18068 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-sarge-etch-sid.log b/testsuite/normal/pbuilder-update-sarge-etch-sid.log
index 4eab61c..9d8796e 100644
--- a/testsuite/normal/pbuilder-update-sarge-etch-sid.log
+++ b/testsuite/normal/pbuilder-update-sarge-etch-sid.log
@@ -1,10 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//31061/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//16340/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -13,8 +13,8 @@ Refreshing the base.tgz
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org sid Release [5722B]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [3926kB]
-Fetched 3932kB in 2s (1742kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [3933kB]
+Fetched 3939kB in 2s (1883kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: You may want to run apt-get update to correct these problems
@@ -25,121 +25,67 @@ Building dependency tree...
 The following NEW packages will be installed:
   libdb4.4
 The following packages will be upgraded:
-  adduser console-common coreutils cpp-3.3 cpp-4.0 dmidecode dpkg dpkg-dev
-  dselect g++-3.3 g++-4.0 gcc-3.3 gcc-3.3-base gcc-4.0 gcc-4.0-base
-  initscripts klogd libc6 libc6-dev libdb1-compat libgcc1 libpam-modules
-  libpam-runtime libpam0g libperl5.8 libselinux1 libstdc++5 libstdc++5-3.3-dev
-  libstdc++6 libstdc++6-4.0-dev login modutils nano netkit-inetd passwd perl
-  perl-base perl-modules procps sed sysklogd sysv-rc sysvinit
-43 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/37.3MB of archives.
-After unpacking 1561kB of additional disk space will be used.
+  adduser coreutils cpp-3.3 cpp-4.0 dmidecode dpkg dpkg-dev dselect g++-3.3
+  g++-4.0 gcc-3.3 gcc-3.3-base gcc-4.0 gcc-4.0-base klogd libc6 libc6-dev
+  libdb1-compat libgcc1 libperl5.8 libstdc++5 libstdc++5-3.3-dev libstdc++6
+  libstdc++6-4.0-dev login modutils passwd perl perl-base perl-modules procps
+  sed sysklogd
+33 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Need to get 0B/36.1MB of archives.
+After unpacking 1954kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
-  dpkg coreutils libc6-dev libc6 libpam-runtime libpam0g libselinux1
-  libpam-modules login perl-modules libdb4.4 libperl5.8 perl-base perl sed
-  sysvinit console-common initscripts cpp-4.0 gcc-4.0-base libgcc1 gcc-4.0
-  g++-4.0 libstdc++6-4.0-dev libstdc++6 sysv-rc passwd adduser dmidecode
-  sysklogd klogd modutils nano netkit-inetd dselect procps dpkg-dev g++-3.3
-  gcc-3.3 cpp-3.3 gcc-3.3-base libstdc++5 libstdc++5-3.3-dev libdb1-compat
-(Reading database ... 12536 files and directories currently installed.)
-Preparing to replace dpkg 1.13.13 (using .../dpkg_1.13.15_amd64.deb) ...
+  dpkg coreutils login perl-modules libc6-dev libc6 libdb4.4 libperl5.8
+  perl-base perl sed cpp-4.0 gcc-4.0-base libgcc1 gcc-4.0 g++-4.0
+  libstdc++6-4.0-dev libstdc++6 passwd adduser dmidecode sysklogd klogd
+  modutils dselect procps dpkg-dev g++-3.3 gcc-3.3 cpp-3.3 gcc-3.3-base
+  libstdc++5 libstdc++5-3.3-dev libdb1-compat
+(Reading database ... 12564 files and directories currently installed.)
+Preparing to replace dpkg 1.13.13 (using .../dpkg_1.13.16_amd64.deb) ...
 Unpacking replacement dpkg ...
-Setting up dpkg (1.13.15) ...
+Setting up dpkg (1.13.16) ...
 
-(Reading database ... 12511 files and directories currently installed.)
+(Reading database ... 12540 files and directories currently installed.)
 Preparing to replace coreutils 5.2.1-2.1 (using .../coreutils_5.93-5_amd64.deb) ...
 Removing `local diversion of /usr/share/man/man1/md5sum.textutils.1.gz to /usr/share/man/man1/md5sum.1.gz'
 Removing `local diversion of /usr/bin/md5sum.textutils to /usr/bin/md5sum'
 Unpacking replacement coreutils ...
 Setting up coreutils (5.93-5) ...
 
-(Reading database ... 12525 files and directories currently installed.)
+(Reading database ... 12554 files and directories currently installed.)
+Preparing to replace login 1:4.0.14-4 (using .../login_1%3a4.0.14-6_amd64.deb) ...
+Unpacking replacement login ...
+Setting up login (4.0.14-6) ...
+Installing new version of config file /etc/login.defs ...
+
+(Reading database ... 12554 files and directories currently installed.)
+Preparing to replace perl-modules 5.8.7-10 (using .../perl-modules_5.8.8-2_all.deb) ...
+Unpacking replacement perl-modules ...
 Preparing to replace libc6-dev 2.3.5-13 (using .../libc6-dev_2.3.6-1_amd64.deb) ...
 Unpacking replacement libc6-dev ...
 Preparing to replace libc6 2.3.5-13 (using .../libc6_2.3.6-1_amd64.deb) ...
 Unpacking replacement libc6 ...
 Setting up libc6 (2.3.6-1) ...
 Current default timezone: 'UTC'.
-Local time is now:      Sat Feb 18 03:15:45 UTC 2006.
-Universal Time is now:  Sat Feb 18 03:15:45 UTC 2006.
+Local time is now:      Wed Feb 22 03:12:24 UTC 2006.
+Universal Time is now:  Wed Feb 22 03:12:24 UTC 2006.
 Run 'tzconfig' if you wish to change it.
 
-(Reading database ... 12498 files and directories currently installed.)
-Preparing to replace libpam-runtime 0.79-3 (using .../libpam-runtime_0.79-3.1_all.deb) ...
-Unpacking replacement libpam-runtime ...
-Setting up libpam-runtime (0.79-3.1) ...
-
-(Reading database ... 12498 files and directories currently installed.)
-Preparing to replace libpam0g 0.79-3 (using .../libpam0g_0.79-3.1_amd64.deb) ...
-Unpacking replacement libpam0g ...
-Setting up libpam0g (0.79-3.1) ...
-
-(Reading database ... 12498 files and directories currently installed.)
-Preparing to replace libselinux1 1.28-2 (using .../libselinux1_1.28-4_amd64.deb) ...
-Unpacking replacement libselinux1 ...
-Setting up libselinux1 (1.28-4) ...
-
-(Reading database ... 12498 files and directories currently installed.)
-Preparing to replace libpam-modules 0.79-3 (using .../libpam-modules_0.79-3.1_amd64.deb) ...
-Unpacking replacement libpam-modules ...
-Setting up libpam-modules (0.79-3.1) ...
-
-(Reading database ... 12498 files and directories currently installed.)
-Preparing to replace login 1:4.0.14-4 (using .../login_1%3a4.0.14-6_amd64.deb) ...
-Unpacking replacement login ...
-Setting up login (4.0.14-6) ...
-Installing new version of config file /etc/login.defs ...
-
-(Reading database ... 12498 files and directories currently installed.)
-Preparing to replace perl-modules 5.8.7-10 (using .../perl-modules_5.8.8-2_all.deb) ...
-Unpacking replacement perl-modules ...
 Selecting previously deselected package libdb4.4.
-Unpacking libdb4.4 (from .../libdb4.4_4.4.20-1_amd64.deb) ...
+(Reading database ... 12538 files and directories currently installed.)
+Unpacking libdb4.4 (from .../libdb4.4_4.4.20-2_amd64.deb) ...
 Preparing to replace libperl5.8 5.8.7-10 (using .../libperl5.8_5.8.8-2_amd64.deb) ...
 Unpacking replacement libperl5.8 ...
 Preparing to replace perl-base 5.8.7-10 (using .../perl-base_5.8.8-2_amd64.deb) ...
 Unpacking replacement perl-base ...
 Setting up perl-base (5.8.8-2) ...
-(Reading database ... 12507 files and directories currently installed.)
+(Reading database ... 12536 files and directories currently installed.)
 Preparing to replace perl 5.8.7-10 (using .../perl_5.8.8-2_amd64.deb) ...
 Unpacking replacement perl ...
 Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-5_amd64.deb) ...
 Unpacking replacement sed ...
 Setting up sed (4.1.4-5) ...
 
-(Reading database ... 12509 files and directories currently installed.)
-Preparing to replace sysvinit 2.86.ds1-4 (using .../sysvinit_2.86.ds1-12_amd64.deb) ...
-Unpacking replacement sysvinit ...
-Setting up sysvinit (2.86.ds1-12) ...
-init: timeout opening/writing control channel /dev/initctl
-
-(Reading database ... 12510 files and directories currently installed.)
-Preparing to replace console-common 0.7.55 (using .../console-common_0.7.55.1_all.deb) ...
-Unpacking replacement console-common ...
-Preparing to replace initscripts 2.86.ds1-4 (using .../initscripts_2.86.ds1-12_amd64.deb) ...
-Unmodified conffile '/etc/init.d/bootclean.sh' obsolete; removed `/etc/init.d/bootclean.sh'
-Unpacking replacement initscripts ...
-Setting up initscripts (2.86.ds1-12) ...
-Installing new version of config file /etc/init.d/bootlogd ...
-Installing new version of config file /etc/init.d/bootmisc.sh ...
-Installing new version of config file /etc/init.d/checkfs.sh ...
-Installing new version of config file /etc/init.d/checkroot.sh ...
-Installing new version of config file /etc/init.d/halt ...
-Installing new version of config file /etc/init.d/hostname.sh ...
-Installing new version of config file /etc/init.d/mountall.sh ...
-Installing new version of config file /etc/init.d/mountnfs.sh ...
-Installing new version of config file /etc/init.d/mountvirtfs ...
-Installing new version of config file /etc/init.d/reboot ...
-Installing new version of config file /etc/init.d/rmnologin ...
-Installing new version of config file /etc/init.d/sendsigs ...
-Installing new version of config file /etc/init.d/single ...
-Installing new version of config file /etc/init.d/umountfs ...
-Installing new version of config file /etc/init.d/umountnfs.sh ...
-Installing new version of config file /etc/init.d/umountroot ...
-Installing new version of config file /etc/init.d/urandom ...
-Installing new version of config file /etc/default/tmpfs ...
-
-(Reading database ... 12525 files and directories currently installed.)
+(Reading database ... 12538 files and directories currently installed.)
 Preparing to replace cpp-4.0 4.0.2-8 (using .../cpp-4.0_4.0.2-9_amd64.deb) ...
 Unpacking replacement cpp-4.0 ...
 Preparing to replace gcc-4.0-base 4.0.2-8 (using .../gcc-4.0-base_4.0.2-9_amd64.deb) ...
@@ -149,7 +95,7 @@ Unpacking replacement libgcc1 ...
 Setting up gcc-4.0-base (4.0.2-9) ...
 Setting up libgcc1 (4.0.2-9) ...
 
-(Reading database ... 12525 files and directories currently installed.)
+(Reading database ... 12538 files and directories currently installed.)
 Preparing to replace gcc-4.0 4.0.2-8 (using .../gcc-4.0_4.0.2-9_amd64.deb) ...
 Unpacking replacement gcc-4.0 ...
 Preparing to replace g++-4.0 4.0.2-8 (using .../g++-4.0_4.0.2-9_amd64.deb) ...
@@ -160,15 +106,10 @@ Preparing to replace libstdc++6 4.0.2-8 (using .../libstdc++6_4.0.2-9_amd64.deb)
 Unpacking replacement libstdc++6 ...
 Setting up libstdc++6 (4.0.2-9) ...
 
-(Reading database ... 12525 files and directories currently installed.)
-Preparing to replace sysv-rc 2.86.ds1-4 (using .../sysv-rc_2.86.ds1-12_all.deb) ...
-Unpacking replacement sysv-rc ...
-Setting up sysv-rc (2.86.ds1-12) ...
-
-(Reading database ... 12535 files and directories currently installed.)
+(Reading database ... 12538 files and directories currently installed.)
 Preparing to replace passwd 1:4.0.14-4 (using .../passwd_1%3a4.0.14-6_amd64.deb) ...
 Unpacking replacement passwd ...
-Preparing to replace adduser 3.80 (using .../archives/adduser_3.83_all.deb) ...
+Preparing to replace adduser 3.80 (using .../archives/adduser_3.84_all.deb) ...
 Unpacking replacement adduser ...
 Preparing to replace dmidecode 2.7-2 (using .../dmidecode_2.8-1_amd64.deb) ...
 Unpacking replacement dmidecode ...
@@ -178,15 +119,11 @@ Preparing to replace klogd 1.4.1-17 (using .../klogd_1.4.1-17.1_amd64.deb) ...
 Unpacking replacement klogd ...
 Preparing to replace modutils 2.4.27.0-3 (using .../modutils_2.4.27.0-4_amd64.deb) ...
 Unpacking replacement modutils ...
-Preparing to replace nano 1.3.10-1 (using .../nano_1.3.10-2_amd64.deb) ...
-Unpacking replacement nano ...
-Preparing to replace netkit-inetd 0.10-10.2 (using .../netkit-inetd_0.10-10.3_amd64.deb) ...
-Unpacking replacement netkit-inetd ...
-Preparing to replace dselect 1.13.13 (using .../dselect_1.13.15_amd64.deb) ...
+Preparing to replace dselect 1.13.13 (using .../dselect_1.13.16_amd64.deb) ...
 Unpacking replacement dselect ...
-Preparing to replace procps 1:3.2.1-2 (using .../procps_1%3a3.2.6-2_amd64.deb) ...
+Preparing to replace procps 1:3.2.5-1 (using .../procps_1%3a3.2.6-2_amd64.deb) ...
 Unpacking replacement procps ...
-Preparing to replace dpkg-dev 1.13.13 (using .../dpkg-dev_1.13.15_all.deb) ...
+Preparing to replace dpkg-dev 1.13.13 (using .../dpkg-dev_1.13.16_all.deb) ...
 Unpacking replacement dpkg-dev ...
 Preparing to replace g++-3.3 1:3.3.6-10 (using .../g++-3.3_1%3a3.3.6-12_amd64.deb) ...
 Unpacking replacement g++-3.3 ...
@@ -202,30 +139,22 @@ Preparing to replace libstdc++5-3.3-dev 1:3.3.6-10 (using .../libstdc++5-3.3-dev
 Unpacking replacement libstdc++5-3.3-dev ...
 Preparing to replace libdb1-compat 2.1.3-8 (using .../libdb1-compat_2.1.3-9_amd64.deb) ...
 Unpacking replacement libdb1-compat ...
+Setting up libdb4.4 (4.4.20-2) ...
 Setting up libc6-dev (2.3.6-1) ...
-Setting up libdb4.4 (4.4.20-1) ...
 Setting up libperl5.8 (5.8.8-2) ...
 
-Setting up console-common (0.7.55.1) ...
-Looking for keymap to install:
-NONE
-
 Setting up cpp-4.0 (4.0.2-9) ...
 Setting up gcc-4.0 (4.0.2-9) ...
 Setting up passwd (4.0.14-6) ...
 
-Setting up adduser (3.83) ...
+Setting up adduser (3.84) ...
 Installing new version of config file /etc/deluser.conf ...
 
 Setting up dmidecode (2.8-1) ...
 Setting up modutils (2.4.27.0-4) ...
 Architecture-specific modutils configuration for x86_64 not found, using defaults
 
-Setting up nano (1.3.10-2) ...
-
-Setting up netkit-inetd (0.10-10.3) ...
-
-Setting up dselect (1.13.15) ...
+Setting up dselect (1.13.16) ...
 Setting up procps (3.2.6-2) ...
 Installing new version of config file /etc/init.d/procps.sh ...
 Installing new version of config file /etc/sysctl.conf ...
@@ -250,7 +179,7 @@ Setting up g++-4.0 (4.0.2-9) ...
 Setting up libstdc++5-3.3-dev (3.3.6-12) ...
 Setting up perl (5.8.8-2) ...
 
-Setting up dpkg-dev (1.13.15) ...
+Setting up dpkg-dev (1.13.16) ...
 Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
@@ -262,10 +191,11 @@ umount: /sys: not mounted
 umount: /run: not found
 umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
-tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh: line 14: kill: (29913) - No such process
- -> user script /var/cache/pbuilder/build//31061/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+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//16340/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//31061 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//16340 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-sarge-etch.log b/testsuite/normal/pbuilder-update-sarge-etch.log
index d1e7eb2..8641d9f 100644
--- a/testsuite/normal/pbuilder-update-sarge-etch.log
+++ b/testsuite/normal/pbuilder-update-sarge-etch.log
@@ -1,18 +1,18 @@
 Upgrading for distribution etch
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//27000/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//12143/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
 Refreshing the base.tgz 
  -> upgrading packages
-Get:1 http://ftp.jp.debian.org etch/main Packages [3640kB]
+Get:1 http://ftp.jp.debian.org etch/main Packages [3650kB]
 Get:2 http://ftp.jp.debian.org etch/main Release [96B]
-Fetched 3640kB in 1s (1837kB/s)
+Fetched 3650kB in 2s (1657kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -38,11 +38,13 @@ The following packages will be upgraded:
   libtextwrap1 libuuid1 linux-kernel-headers login logrotate mailx make makedev
   man-db manpages modutils mount nano ncurses-base ncurses-bin net-tools
   netbase netkit-inetd passwd patch pciutils perl perl-base perl-modules ppp
-  pppconfig pppoeconf psmisc sysv-rc sysvinit tar tasksel telnet util-linux
-  wget whiptail zlib1g
-120 upgraded, 18 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/64.1MB of archives.
+  pppconfig pppoeconf procps psmisc sysv-rc sysvinit tar tasksel telnet
+  util-linux wget whiptail zlib1g
+121 upgraded, 18 newly installed, 0 to remove and 0 not upgraded.
+Need to get 226kB/64.4MB of archives.
 After unpacking 37.7MB of additional disk space will be used.
+Get:1 http://ftp.jp.debian.org etch/main procps 1:3.2.5-1 [226kB]
+Fetched 226kB in 0s (1117kB/s)
 (Reading database ... 10950 files and directories currently installed.)
 Preparing to replace linux-kernel-headers 2.5.999-test7-bk-17 (using .../linux-kernel-headers_2.6.13+0rc3-2_amd64.deb) ...
 Unpacking replacement linux-kernel-headers ...
@@ -75,8 +77,8 @@ Unpacking replacement libc6 ...
 Setting up libc6 (2.3.5-13) ...
 Checking for services that may need to be restarted...done.
 Current default timezone: 'UTC'.
-Local time is now:      Sat Feb 18 03:13:45 UTC 2006.
-Universal Time is now:  Sat Feb 18 03:13:45 UTC 2006.
+Local time is now:      Wed Feb 22 03:10:44 UTC 2006.
+Universal Time is now:  Wed Feb 22 03:10:44 UTC 2006.
 Run 'tzconfig' if you wish to change it.
 
 (Reading database ... 11284 files and directories currently installed.)
@@ -171,28 +173,28 @@ Setting up libsepol1 (1.10-2) ...
 
 Selecting previously deselected package libselinux1.
 (Reading database ... 11332 files and directories currently installed.)
-Unpacking libselinux1 (from .../libselinux1_1.28-2_amd64.deb) ...
-Setting up libselinux1 (1.28-2) ...
+Unpacking libselinux1 (from .../libselinux1_1.28-4_amd64.deb) ...
+Setting up libselinux1 (1.28-4) ...
 
 (Reading database ... 11337 files and directories currently installed.)
-Preparing to replace libpam-runtime 0.76-22 (using .../libpam-runtime_0.79-3_all.deb) ...
+Preparing to replace libpam-runtime 0.76-22 (using .../libpam-runtime_0.79-3.1_all.deb) ...
 Unpacking replacement libpam-runtime ...
-Setting up libpam-runtime (0.79-3) ...
+Setting up libpam-runtime (0.79-3.1) ...
 Installing new version of config file /etc/pam.conf ...
 
 (Reading database ... 11337 files and directories currently installed.)
-Preparing to replace libpam0g 0.76-22 (using .../libpam0g_0.79-3_amd64.deb) ...
+Preparing to replace libpam0g 0.76-22 (using .../libpam0g_0.79-3.1_amd64.deb) ...
 Unpacking replacement libpam0g ...
-Setting up libpam0g (0.79-3) ...
+Setting up libpam0g (0.79-3.1) ...
 
 (Reading database ... 11337 files and directories currently installed.)
-Preparing to replace libpam-modules 0.76-22 (using .../libpam-modules_0.79-3_amd64.deb) ...
+Preparing to replace libpam-modules 0.76-22 (using .../libpam-modules_0.79-3.1_amd64.deb) ...
 Unpacking replacement libpam-modules ...
 Setting up libdb4.3 (4.3.29-4) ...
-Setting up libpam-modules (0.79-3) ...
+Setting up libpam-modules (0.79-3.1) ...
+Installing new version of config file /etc/security/limits.conf ...
 Installing new version of config file /etc/security/access.conf ...
 Installing new version of config file /etc/security/pam_env.conf ...
-Installing new version of config file /etc/security/limits.conf ...
 
 (Reading database ... 11341 files and directories currently installed.)
 Preparing to replace login 1:4.0.3-31sarge5 (using .../login_1%3a4.0.14-4_amd64.deb) ...
@@ -222,33 +224,38 @@ Preparing to replace perl-base 5.8.4-8 (using .../perl-base_5.8.7-10_amd64.deb)
 Unpacking replacement perl-base ...
 Setting up perl-base (5.8.7-10) ...
 (Reading database ... 11896 files and directories currently installed.)
-Preparing to replace sysvinit 2.86.ds1-1 (using .../sysvinit_2.86.ds1-4_amd64.deb) ...
+Preparing to replace sysv-rc 2.86.ds1-1 (using .../sysv-rc_2.86.ds1-12_all.deb) ...
+Unpacking replacement sysv-rc ...
+Setting up sysv-rc (2.86.ds1-12) ...
+
+(Reading database ... 11906 files and directories currently installed.)
+Preparing to replace sysvinit 2.86.ds1-1 (using .../sysvinit_2.86.ds1-12_amd64.deb) ...
 Unpacking replacement sysvinit ...
-Setting up sysvinit (2.86.ds1-4) ...
+Setting up sysvinit (2.86.ds1-12) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 11896 files and directories currently installed.)
+(Reading database ... 11907 files and directories currently installed.)
 Preparing to replace tar 1.14-2 (using .../tar_1.15.1-2_amd64.deb) ...
 Unpacking replacement tar ...
 Setting up tar (1.15.1-2) ...
 
 Selecting previously deselected package lsb-base.
-(Reading database ... 11900 files and directories currently installed.)
+(Reading database ... 11911 files and directories currently installed.)
 Unpacking lsb-base (from .../lsb-base_3.0-15_all.deb) ...
 Setting up lsb-base (3.0-15) ...
 Selecting previously deselected package libslang2.
-(Reading database ... 11907 files and directories currently installed.)
+(Reading database ... 11918 files and directories currently installed.)
 Unpacking libslang2 (from .../libslang2_2.0.5-3_amd64.deb) ...
 Setting up libslang2 (2.0.5-3) ...
 
-(Reading database ... 11919 files and directories currently installed.)
+(Reading database ... 11930 files and directories currently installed.)
 Preparing to replace util-linux 2.12p-4 (using .../util-linux_2.12r-6_amd64.deb) ...
 Unpacking replacement util-linux ...
 Setting up util-linux (2.12r-6) ...
 Installing new version of config file /etc/init.d/hwclock.sh ...
 Installing new version of config file /etc/init.d/hwclockfirst.sh ...
 
-(Reading database ... 11919 files and directories currently installed.)
+(Reading database ... 11930 files and directories currently installed.)
 Preparing to replace ncurses-base 5.4-4 (using .../ncurses-base_5.5-1_all.deb) ...
 Removing obsolete conffile /etc/terminfo/E/Eterm ...
 Removing obsolete conffile /etc/terminfo/E/Eterm-color ...
@@ -286,7 +293,7 @@ Removing obsolete conffile /etc/terminfo/x/xterm-vt220 ...
 Removing obsolete conffile /etc/terminfo/x/xterm-color ...
 Unpacking replacement ncurses-base ...
 Setting up ncurses-base (5.5-1) ...
-(Reading database ... 11923 files and directories currently installed.)
+(Reading database ... 11934 files and directories currently installed.)
 Preparing to replace liblocale-gettext-perl 1.01-17 (using .../liblocale-gettext-perl_1.05-1_amd64.deb) ...
 Unpacking replacement liblocale-gettext-perl ...
 Preparing to replace libtext-iconv-perl 1.2-3 (using .../libtext-iconv-perl_1.4-2_amd64.deb) ...
@@ -312,8 +319,8 @@ Setting up libtext-wrapi18n-perl (0.06-4) ...
 Setting up debconf-i18n (1.4.70) ...
 Setting up debconf (1.4.70) ...
 
-(Reading database ... 11951 files and directories currently installed.)
-Preparing to replace console-common 0.7.49 (using .../console-common_0.7.55_all.deb) ...
+(Reading database ... 11962 files and directories currently installed.)
+Preparing to replace console-common 0.7.49 (using .../console-common_0.7.55.1_all.deb) ...
 Unpacking replacement console-common ...
 Selecting previously deselected package gcc-4.0-base.
 Unpacking gcc-4.0-base (from .../gcc-4.0-base_4.0.2-8_amd64.deb) ...
@@ -323,11 +330,11 @@ Setting up gcc-4.0-base (4.0.2-8) ...
 Setting up libgcc1 (4.0.2-8) ...
 
 Selecting previously deselected package libstdc++6.
-(Reading database ... 11963 files and directories currently installed.)
+(Reading database ... 11975 files and directories currently installed.)
 Unpacking libstdc++6 (from .../libstdc++6_4.0.2-8_amd64.deb) ...
 Setting up libstdc++6 (4.0.2-8) ...
 
-(Reading database ... 11966 files and directories currently installed.)
+(Reading database ... 11978 files and directories currently installed.)
 Preparing to replace apt-utils 0.5.28.6 (using .../apt-utils_0.6.43.2_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Selecting previously deselected package libncursesw5.
@@ -340,16 +347,16 @@ Preparing to replace apt 0.5.28.6 (using .../apt_0.6.43.2_amd64.deb) ...
 Unpacking replacement apt ...
 Setting up apt (0.6.43.2) ...
 
-(Reading database ... 11993 files and directories currently installed.)
+(Reading database ... 12005 files and directories currently installed.)
 Preparing to replace dselect 1.10.28 (using .../dselect_1.13.13_amd64.deb) ...
 Unpacking replacement dselect ...
 Setting up dselect (1.13.13) ...
 Installing new version of config file /etc/dpkg/dselect.cfg ...
-(Reading database ... 11993 files and directories currently installed.)
-Preparing to replace initscripts 2.86.ds1-1 (using .../initscripts_2.86.ds1-4_amd64.deb) ...
+(Reading database ... 12005 files and directories currently installed.)
+Preparing to replace initscripts 2.86.ds1-1 (using .../initscripts_2.86.ds1-12_amd64.deb) ...
+Unmodified conffile '/etc/init.d/bootclean.sh' obsolete; removed `/etc/init.d/bootclean.sh'
 Unpacking replacement initscripts ...
-Setting up initscripts (2.86.ds1-4) ...
-Installing new version of config file /etc/init.d/bootclean.sh ...
+Setting up initscripts (2.86.ds1-12) ...
 Installing new version of config file /etc/init.d/bootlogd ...
 Installing new version of config file /etc/init.d/bootmisc.sh ...
 Installing new version of config file /etc/init.d/checkfs.sh ...
@@ -368,7 +375,7 @@ Installing new version of config file /etc/init.d/umountnfs.sh ...
 Installing new version of config file /etc/init.d/urandom ...
 Installing new version of config file /etc/default/tmpfs ...
 
-(Reading database ... 11994 files and directories currently installed.)
+(Reading database ... 12020 files and directories currently installed.)
 Preparing to replace libattr1 2.4.16-1 (using .../libattr1_2.4.25-1_amd64.deb) ...
 Unpacking replacement libattr1 ...
 Preparing to replace libacl1 2.2.23-1 (using .../libacl1_2.2.34-1_amd64.deb) ...
@@ -377,27 +384,27 @@ Setting up libattr1 (2.4.25-1) ...
 
 Setting up libacl1 (2.2.34-1) ...
 
-(Reading database ... 11994 files and directories currently installed.)
+(Reading database ... 12020 files and directories currently installed.)
 Preparing to replace libblkid1 1.37-2sarge1 (using .../libblkid1_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement libblkid1 ...
 Setting up libblkid1 (1.38+1.39-WIP-2005.12.31-1) ...
 
-(Reading database ... 11994 files and directories currently installed.)
+(Reading database ... 12020 files and directories currently installed.)
 Preparing to replace libcomerr2 1.37-2sarge1 (using .../libcomerr2_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement libcomerr2 ...
 Setting up libcomerr2 (1.38+1.39-WIP-2005.12.31-1) ...
 
-(Reading database ... 11994 files and directories currently installed.)
+(Reading database ... 12020 files and directories currently installed.)
 Preparing to replace libss2 1.37-2sarge1 (using .../libss2_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement libss2 ...
 Setting up libss2 (1.38+1.39-WIP-2005.12.31-1) ...
 
-(Reading database ... 11994 files and directories currently installed.)
+(Reading database ... 12020 files and directories currently installed.)
 Preparing to replace libuuid1 1.37-2sarge1 (using .../libuuid1_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement libuuid1 ...
 Setting up libuuid1 (1.38+1.39-WIP-2005.12.31-1) ...
 
-(Reading database ... 11994 files and directories currently installed.)
+(Reading database ... 12020 files and directories currently installed.)
 Preparing to replace libgpg-error0 1.0-1 (using .../libgpg-error0_1.1-4_amd64.deb) ...
 Unpacking replacement libgpg-error0 ...
 Preparing to replace libgcrypt11 1.2.0-11.1 (using .../libgcrypt11_1.2.2-1_amd64.deb) ...
@@ -406,7 +413,7 @@ Preparing to replace zlib1g 1:1.2.2-4 (using .../zlib1g_1%3a1.2.3-9_amd64.deb) .
 Unpacking replacement zlib1g ...
 Setting up zlib1g (1.2.3-9) ...
 
-(Reading database ... 11994 files and directories currently installed.)
+(Reading database ... 12020 files and directories currently installed.)
 Preparing to replace libopencdk8 0.5.5-10 (using .../libopencdk8_0.5.7-2_amd64.deb) ...
 Unpacking replacement libopencdk8 ...
 Preparing to replace libtasn1-2 0.2.10-3 (using .../libtasn1-2_0.2.17-1_amd64.deb) ...
@@ -427,7 +434,7 @@ Preparing to replace cron 3.0pl1-86 (using .../cron_3.0pl1-92_amd64.deb) ...
 Unpacking replacement cron ...
 Preparing to replace exim4-config 4.50-8 (using .../exim4-config_4.60-3_all.deb) ...
 Unpacking replacement exim4-config ...
-Preparing to replace netkit-inetd 0.10-10 (using .../netkit-inetd_0.10-10.2_amd64.deb) ...
+Preparing to replace netkit-inetd 0.10-10 (using .../netkit-inetd_0.10-10.3_amd64.deb) ...
 Unpacking replacement netkit-inetd ...
 Preparing to replace iputils-ping 3:20020927-2 (using .../iputils-ping_3%3a20020927-3_amd64.deb) ...
 Unpacking replacement iputils-ping ...
@@ -441,12 +448,7 @@ Setting up passwd (4.0.14-4) ...
 Installing new version of config file /etc/pam.d/chfn ...
 Installing new version of config file /etc/pam.d/chsh ...
 
-(Reading database ... 12124 files and directories currently installed.)
-Preparing to replace sysv-rc 2.86.ds1-1 (using .../sysv-rc_2.86.ds1-4_all.deb) ...
-Unpacking replacement sysv-rc ...
-Setting up sysv-rc (2.86.ds1-4) ...
-
-(Reading database ... 12124 files and directories currently installed.)
+(Reading database ... 12150 files and directories currently installed.)
 Preparing to replace binutils 2.15-6 (using .../binutils_2.16.1cvs20060117-1_amd64.deb) ...
 Unpacking replacement binutils ...
 Preparing to replace libstdc++5-3.3-dev 1:3.3.5-13 (using .../libstdc++5-3.3-dev_1%3a3.3.6-10_amd64.deb) ...
@@ -465,7 +467,7 @@ Setting up gcc-3.3-base (3.3.6-10) ...
 Setting up libstdc++5 (3.3.6-10) ...
 
 Selecting previously deselected package dmidecode.
-(Reading database ... 12146 files and directories currently installed.)
+(Reading database ... 12172 files and directories currently installed.)
 Unpacking dmidecode (from .../dmidecode_2.7-2_amd64.deb) ...
 Selecting previously deselected package laptop-detect.
 Unpacking laptop-detect (from .../laptop-detect_0.12.1_amd64.deb) ...
@@ -499,7 +501,7 @@ Preparing to replace manpages 1.70-1 (using .../manpages_2.17-1_all.deb) ...
 Unpacking replacement manpages ...
 Preparing to replace modutils 2.4.26-1.2 (using .../modutils_2.4.27.0-3_amd64.deb) ...
 Unpacking replacement modutils ...
-Preparing to replace nano 1.2.4-5 (using .../nano_1.3.10-1_amd64.deb) ...
+Preparing to replace nano 1.2.4-5 (using .../nano_1.3.10-2_amd64.deb) ...
 Unpacking replacement nano ...
 Preparing to replace net-tools 1.60-10 (using .../net-tools_1.60-17_amd64.deb) ...
 Unpacking replacement net-tools ...
@@ -511,6 +513,8 @@ Preparing to replace libnewt0.51 0.51.6-20 (using .../libnewt0.51_0.51.6-31_amd6
 Unpacking replacement libnewt0.51 ...
 Preparing to replace makedev 2.3.1-77 (using .../makedev_2.3.1-80_all.deb) ...
 Unpacking replacement makedev ...
+Preparing to replace procps 1:3.2.1-2 (using .../procps_1%3a3.2.5-1_amd64.deb) ...
+Unpacking replacement procps ...
 Preparing to replace at 3.1.8-11 (using .../archives/at_3.1.10_amd64.deb) ...
 Stopping deferred execution scheduler: atd.
 Unpacking replacement at ...
@@ -621,8 +625,7 @@ Installing new version of config file /etc/exim4/conf.d/transport/30_exim4-confi
 Installing new version of config file /etc/exim4/passwd.client ...
 Installing new version of config file /etc/exim4/exim4.conf.template ...
 
-Setting up netkit-inetd (0.10-10.2) ...
-Restarting internet superserver: inetd.
+Setting up netkit-inetd (0.10-10.3) ...
 
 Setting up iputils-ping (20020927-3) ...
 Setting up netbase (4.24) ...
@@ -676,7 +679,7 @@ Installing new version of config file /etc/modutils/aliases ...
 Installing new version of config file /etc/modutils/actions ...
 Architecture-specific modutils configuration for x86_64 not found, using defaults
 
-Setting up nano (1.3.10-1) ...
+Setting up nano (1.3.10-2) ...
 Installing new version of config file /etc/nanorc ...
 
 Setting up net-tools (1.60-17) ...
@@ -689,6 +692,10 @@ Setting up whiptail (0.51.6-31) ...
 Setting up makedev (2.3.1-80) ...
 Installing new version of config file /etc/init.d/makedev ...
 
+Setting up procps (3.2.5-1) ...
+Installing new version of config file /etc/sysctl.conf ...
+Installing new version of config file /etc/init.d/procps.sh ...
+
 Setting up at (3.1.10) ...
 Installing new version of config file /etc/init.d/atd ...
 
@@ -733,7 +740,7 @@ Setting up libssl0.9.7 (0.9.7g-5) ...
 Setting up libstdc++5-3.3-dev (3.3.6-10) ...
 Setting up libstdc++6-4.0-dev (4.0.2-8) ...
 Setting up perl-modules (5.8.7-10) ...
-Setting up console-common (0.7.55) ...
+Setting up console-common (0.7.55.1) ...
 Installing new version of config file /etc/init.d/keymap.sh ...
 Looking for keymap to install:
 NONE
@@ -758,13 +765,16 @@ dpkg-dev is already the newest version.
 apt is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 Copying back the cached apt archive contents
+ -> new cache content procps_1%3a3.2.5-1_amd64.deb added
 umount: /sys: not mounted
 umount: /run: not found
 umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
- -> user script /var/cache/pbuilder/build//27000/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+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//12143/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//27000 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//12143 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-etch.log b/testsuite/normal/pdebuild-internal-etch.log
index 9abf79c..e576eef 100644
--- a/testsuite/normal/pdebuild-internal-etch.log
+++ b/testsuite/normal/pdebuild-internal-etch.log
@@ -1,12 +1,12 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/24107/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/9203/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.10 2005/12/19 14:34:18 dancer Exp $
@@ -24,7 +24,7 @@ The following NEW packages will be installed:
 Need to get 0B/136kB of archives.
 After unpacking 758kB of additional disk space will be used.
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 11150 files and directories currently installed.)
+(Reading database ... 11225 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.38_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.38_amd64.deb) ...
@@ -59,7 +59,7 @@ The following NEW packages will be installed:
 Need to get 0B/2932kB of archives.
 After unpacking 9728kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11247 files and directories currently installed.)
+(Reading database ... 11322 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -103,7 +103,7 @@ The following NEW packages will be installed:
 Need to get 0B/97.9kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11857 files and directories currently installed.)
+(Reading database ... 11932 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.7_amd64.deb) ...
 Setting up fakeroot (1.5.7) ...
 
@@ -116,14 +116,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -312,18 +312,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 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; \
@@ -336,26 +336,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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -367,6 +367,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
@@ -405,7 +406,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
-Sat Feb 18 03:23:27 UTC 2006
+Wed Feb 22 03:18:37 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -418,6 +419,18 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 DUMPing parameters passed to llexec
 [2] 
+3: Using sleep as the remote shell
+3: Show machine names on output
+3: Adding machine 5,4,3,2,1 to list
+3: Setting forklimit to 3 and wait_shell to 0
+3: DUMPing parameters passed to llexec
+3: [3] 
+Using sleep as the remote shell
+Show machine names on output
+Adding machine 5,4,3,2,1 to list
+Setting forklimit to 3 and wait_shell to 0
+DUMPing parameters passed to llexec
+[3] 
 1: Using sleep as the remote shell
 1: Show machine names on output
 1: Adding machine 5,4,3,2,1 to list
@@ -432,18 +445,6 @@ Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 DUMPing parameters passed to llexec
 [1] 
-3: Using sleep as the remote shell
-3: Show machine names on output
-3: Adding machine 5,4,3,2,1 to list
-3: Setting forklimit to 3 and wait_shell to 0
-3: DUMPing parameters passed to llexec
-3: [3] 
-Using sleep as the remote shell
-Show machine names on output
-Adding machine 5,4,3,2,1 to list
-Setting forklimit to 3 and wait_shell to 0
-DUMPing parameters passed to llexec
-[3] 
 4: Using sleep as the remote shell
 4: Show machine names on output
 4: Adding machine 5,4,3,2,1 to list
@@ -475,7 +476,7 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sat Feb 18 03:23:32 UTC 2006
+Wed Feb 22 03:18:42 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -491,9 +492,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -503,58 +504,58 @@ dh_clean: Compatibility levels before 4 are deprecated.
 dh_installdirs
 dh_installdirs: Compatibility levels before 4 are deprecated.
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -593,6 +594,6 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/24107 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/9203 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-sarge.log b/testsuite/normal/pdebuild-internal-sarge.log
index c5df99c..cef1624 100644
--- a/testsuite/normal/pdebuild-internal-sarge.log
+++ b/testsuite/normal/pdebuild-internal-sarge.log
@@ -1,12 +1,12 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/19439/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/4694/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.10 2005/12/19 14:34:18 dancer Exp $
@@ -110,14 +110,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -305,18 +305,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 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; \
@@ -329,26 +329,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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -386,8 +386,8 @@ success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
-c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+c: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -399,7 +399,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
-Sat Feb 18 03:12:18 UTC 2006
+Wed Feb 22 03:09:31 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -469,14 +469,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
-Sat Feb 18 03:12:23 UTC 2006
+Wed Feb 22 03:09:36 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
 b: b
-dsh: Process terminated (before write).
 c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -485,9 +485,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -495,58 +495,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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
   done; \
 else \
   : ; \
 fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 done
-test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -570,6 +570,6 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/19439 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/4694 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-sid.log b/testsuite/normal/pdebuild-internal-sid.log
index 9137b78..569efd2 100644
--- a/testsuite/normal/pdebuild-internal-sid.log
+++ b/testsuite/normal/pdebuild-internal-sid.log
@@ -1,12 +1,12 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/21268/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/6499/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.10 2005/12/19 14:34:18 dancer Exp $
@@ -24,18 +24,18 @@ The following NEW packages will be installed:
 Need to get 0B/136kB of archives.
 After unpacking 758kB of additional disk space will be used.
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 11177 files and directories currently installed.)
+(Reading database ... 11212 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.38_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.38_amd64.deb) ...
 Selecting previously deselected package cdebootstrap.
 Unpacking cdebootstrap (from .../cdebootstrap_0.3.10_amd64.deb) ...
 Selecting previously deselected package pbuilder.
-Unpacking pbuilder (from .../pbuilder_0.147_all.deb) ...
+Unpacking pbuilder (from .../pbuilder_0.148_all.deb) ...
 Setting up libdebian-installer4 (0.38) ...
 Setting up libdebian-installer-extra4 (0.38) ...
 Setting up cdebootstrap (0.3.10) ...
-Setting up pbuilder (0.147) ...
+Setting up pbuilder (0.148) ...
 Setting DEBBUILDOPTS=
  -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.23 2006/02/11 13:17:04 dancer Exp $
  -> Considering  debhelper (>> 3.0.0)
@@ -59,7 +59,7 @@ The following NEW packages will be installed:
 Need to get 0B/2932kB of archives.
 After unpacking 9728kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11274 files and directories currently installed.)
+(Reading database ... 11309 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -103,7 +103,7 @@ The following NEW packages will be installed:
 Need to get 0B/97.9kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11884 files and directories currently installed.)
+(Reading database ... 11919 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.7_amd64.deb) ...
 Setting up fakeroot (1.5.7) ...
 
@@ -116,14 +116,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -312,18 +312,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 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; \
@@ -336,26 +336,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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -392,9 +392,9 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
+d: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -402,11 +402,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
-Sat Feb 18 03:06:01 UTC 2006
+Wed Feb 22 03:05:03 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -476,14 +476,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
-Sat Feb 18 03:06:06 UTC 2006
+Wed Feb 22 03:05:08 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-dsh: Process terminated (before write).
-c: c
 b: b
+c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -492,9 +492,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -504,58 +504,58 @@ dh_clean: Compatibility levels before 4 are deprecated.
 dh_installdirs
 dh_installdirs: Compatibility levels before 4 are deprecated.
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/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/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -594,6 +594,6 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/21268 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/6499 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-etch.log b/testsuite/normal/pdebuild-normal-etch.log
index 6dfe210..b8d4cab 100644
--- a/testsuite/normal/pdebuild-normal-etch.log
+++ b/testsuite/normal/pdebuild-normal-etch.log
@@ -6,14 +6,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -31,14 +31,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Feb 18 12:21:26 JST 2006
-pbuilder-time-stamp: 1140232886
+Current time: Wed Feb 22 12:16:58 JST 2006
+pbuilder-time-stamp: 1140578218
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/17143/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/2102/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -66,7 +66,7 @@ The following NEW packages will be installed:
 Need to get 0B/2932kB of archives.
 After unpacking 9728kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11150 files and directories currently installed.)
+(Reading database ... 11225 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -110,13 +110,13 @@ The following NEW packages will be installed:
 Need to get 0B/97.9kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11760 files and directories currently installed.)
+(Reading database ... 11835 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.7_amd64.deb) ...
 Setting up fakeroot (1.5.7) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/17143/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/17143/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/2102/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/2102/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -446,7 +446,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
-Sat Feb 18 03:22:21 UTC 2006
+Wed Feb 22 03:17:45 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -459,6 +459,18 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 DUMPing parameters passed to llexec
 [2] 
+3: Using sleep as the remote shell
+3: Show machine names on output
+3: Adding machine 5,4,3,2,1 to list
+3: Setting forklimit to 3 and wait_shell to 0
+3: DUMPing parameters passed to llexec
+3: [3] 
+Using sleep as the remote shell
+Show machine names on output
+Adding machine 5,4,3,2,1 to list
+Setting forklimit to 3 and wait_shell to 0
+DUMPing parameters passed to llexec
+[3] 
 1: Using sleep as the remote shell
 1: Show machine names on output
 1: Adding machine 5,4,3,2,1 to list
@@ -473,18 +485,6 @@ Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 DUMPing parameters passed to llexec
 [1] 
-3: Using sleep as the remote shell
-3: Show machine names on output
-3: Adding machine 5,4,3,2,1 to list
-3: Setting forklimit to 3 and wait_shell to 0
-3: DUMPing parameters passed to llexec
-3: [3] 
-Using sleep as the remote shell
-Show machine names on output
-Adding machine 5,4,3,2,1 to list
-Setting forklimit to 3 and wait_shell to 0
-DUMPing parameters passed to llexec
-[3] 
 4: Using sleep as the remote shell
 4: Show machine names on output
 4: Adding machine 5,4,3,2,1 to list
@@ -516,7 +516,7 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sat Feb 18 03:22:26 UTC 2006
+Wed Feb 22 03:17:50 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -646,7 +646,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Feb 18 12:22:28 JST 2006
-pbuilder-time-stamp: 1140232948
+Current time: Wed Feb 22 12:17:53 JST 2006
+pbuilder-time-stamp: 1140578273
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/17143 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/2102 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-sarge.log b/testsuite/normal/pdebuild-normal-sarge.log
index cfbd86d..bae386a 100644
--- a/testsuite/normal/pdebuild-normal-sarge.log
+++ b/testsuite/normal/pdebuild-normal-sarge.log
@@ -6,14 +6,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -31,14 +31,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Feb 18 12:10:24 JST 2006
-pbuilder-time-stamp: 1140232224
+Current time: Wed Feb 22 12:08:22 JST 2006
+pbuilder-time-stamp: 1140577702
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/12479/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/30062/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -115,8 +115,8 @@ Unpacking fakeroot (from .../fakeroot_1.2.10_amd64.deb) ...
 Setting up fakeroot (1.2.10) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/12479/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/12479/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/30062/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/30062/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -402,7 +402,6 @@ test to check that unknown parameter checking is right.
 PASS: tests/param-unknown.sh
 test1
 test2
-dsh: Process terminated (before write).
 PASS: tests/param-i.sh
 Check that cn4 option is working.
 PASS: tests/param-cn4.sh
@@ -427,9 +426,9 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
+b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
-b: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -441,7 +440,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
-Sat Feb 18 03:11:13 UTC 2006
+Wed Feb 22 03:08:52 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -511,14 +510,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
-Sat Feb 18 03:11:18 UTC 2006
+Wed Feb 22 03:08:57 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
 b: b
-c: c
 dsh: Process terminated (before write).
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -624,7 +623,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Feb 18 12:11:20 JST 2006
-pbuilder-time-stamp: 1140232280
+Current time: Wed Feb 22 12:08:59 JST 2006
+pbuilder-time-stamp: 1140577739
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/12479 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/30062 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-sid.log b/testsuite/normal/pdebuild-normal-sid.log
index b78e124..b7665cd 100644
--- a/testsuite/normal/pdebuild-normal-sid.log
+++ b/testsuite/normal/pdebuild-normal-sid.log
@@ -6,14 +6,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -31,14 +31,14 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sat Feb 18 12:03:55 JST 2006
-pbuilder-time-stamp: 1140231835
+Current time: Wed Feb 22 12:03:23 JST 2006
+pbuilder-time-stamp: 1140577403
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/14305/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/31862/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -66,7 +66,7 @@ The following NEW packages will be installed:
 Need to get 0B/2932kB of archives.
 After unpacking 9728kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11177 files and directories currently installed.)
+(Reading database ... 11212 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
@@ -110,13 +110,13 @@ The following NEW packages will be installed:
 Need to get 0B/97.9kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11787 files and directories currently installed.)
+(Reading database ... 11822 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.7_amd64.deb) ...
 Setting up fakeroot (1.5.7) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/14305/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/14305/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/31862/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/31862/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -390,7 +390,6 @@ make[2]: Entering directory `/tmp/buildd/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
 make[2]: Leaving directory `/tmp/buildd/dsh-0.25.6/po'
 make[2]: Entering directory `/tmp/buildd/dsh-0.25.6'
-sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 /usr/bin/make  dsh
 make[3]: Entering directory `/tmp/buildd/dsh-0.25.6'
 make[3]: `dsh' is up to date.
@@ -432,10 +431,10 @@ success
 success
 success
 success
-a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
-c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+a: dsh: Failed executing ./invalid-exec-file with llexec call
+c: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -443,11 +442,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
-Sat Feb 18 03:04:48 UTC 2006
+Wed Feb 22 03:04:08 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -517,14 +516,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
-Sat Feb 18 03:04:53 UTC 2006
+Wed Feb 22 03:04:13 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
 b: b
-dsh: Process terminated (before write).
 c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -647,7 +646,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sat Feb 18 12:04:55 JST 2006
-pbuilder-time-stamp: 1140231895
+Current time: Wed Feb 22 12:04:16 JST 2006
+pbuilder-time-stamp: 1140577456
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.a4LqWt/dir3/14305 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.OPDMkD/dir3/31862 and its subdirectories
diff --git a/testsuite/regression/344089-initscripts-inetd-workaround-check.sh b/testsuite/regression/344089-initscripts-inetd-workaround-check.sh
deleted file mode 100644
index cb1bb01..0000000
--- a/testsuite/regression/344089-initscripts-inetd-workaround-check.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-#make sure that workaround for #344089, and #262627 work.
-
-sudo cp /var/cache/pbuilder/base-sarge.tgz work/base-unstable.tgz
-sudo pbuilder update  --logfile "$OUTPUT_LOGNAME" --distribution unstable --basetgz work/base-unstable.tgz --hookdir /usr/share/doc/pbuilder/examples/344089 --override-config
-
author	dancer <dancer>	2006-02-22 15:13:33 +0000
committer	dancer <dancer>	2006-02-22 15:13:33 +0000
commit	f3a31e42bee44bf0471e08613fa0729486705bed (patch)
tree	e20cc692dce7ec31bdd55063ed1f96d73f172c08 /testsuite
parent	1181cd7f3600c3a4d80ac3637bf6aa7b6027e11b (diff)
download	pbuilder-f3a31e42bee44bf0471e08613fa0729486705bed.tar pbuilder-f3a31e42bee44bf0471e08613fa0729486705bed.tar.gz