success

author: dancer <dancer> 2006-04-03 13:16:57 +0000
committer: dancer <dancer> 2006-04-03 13:16:57 +0000
commit: 0085d7461a7d1191a2fee4f035b0e7f6370871ef (patch)
tree: 1f98529f4d0a30be8926e3294c9be24ddb6ae531 /testsuite
parent: a27e04a3b62c83efc0c4fbe29382c2a0acd0a77b (diff)
download: pbuilder-0085d7461a7d1191a2fee4f035b0e7f6370871ef.tar
pbuilder-0085d7461a7d1191a2fee4f035b0e7f6370871ef.tar.gz
40 files changed, 1284 insertions, 1308 deletions
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
index 6be78ef..c422d44 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 Apr  1 12:41:18 JST 2006
-pbuilder-time-stamp: 1143862878
+Current time: Mon Apr  3 13:03:16 JST 2006
+pbuilder-time-stamp: 1144036996
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/20897/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/2840/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 html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package gettext-base.
-(Reading database ... 11041 files and directories currently installed.)
+(Reading database ... 11040 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.17-1_amd64.deb) ...
@@ -86,17 +86,17 @@ After unpacking 401kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 11695 files and directories currently installed.)
+(Reading database ... 11694 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
 Setting up fakeroot (1.5.8) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/20897/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/20897/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/2840/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/2840/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -380,6 +380,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
@@ -414,11 +415,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 Apr  1 03:42:23 UTC 2006
+Mon Apr  3 04:04: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
@@ -488,13 +489,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 Apr  1 03:42:28 UTC 2006
+Mon Apr  3 04:04:14 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
@@ -618,7 +619,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 Apr  1 12:42:30 JST 2006
-pbuilder-time-stamp: 1143862950
+Current time: Mon Apr  3 13:04:17 JST 2006
+pbuilder-time-stamp: 1144037057
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/20897 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/2840 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log b/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log
index b18d578..a4d2c7c 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 Apr  1 12:31:30 JST 2006
-pbuilder-time-stamp: 1143862290
+Current time: Mon Apr  3 12:54:06 JST 2006
+pbuilder-time-stamp: 1144036446
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/20283/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/19452/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.tQtcio/dir1/20283/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/20283/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/19452/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/19452/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -395,8 +395,8 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
-b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
+b: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -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 Apr  1 03:32:21 UTC 2006
+Mon Apr  3 03:54: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
@@ -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 Apr  1 03:32:26 UTC 2006
+Mon Apr  3 03:54:57 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).
 a: a
+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 Apr  1 12:32:28 JST 2006
-pbuilder-time-stamp: 1143862348
+Current time: Mon Apr  3 12:54:59 JST 2006
+pbuilder-time-stamp: 1144036499
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/20283 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/19452 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
index cd595ef..982a7fd 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 Apr  1 12:24:52 JST 2006
-pbuilder-time-stamp: 1143861892
+Current time: Mon Apr  3 12:47:08 JST 2006
+pbuilder-time-stamp: 1144036028
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/28951/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/12453/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 html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package gettext-base.
-(Reading database ... 11080 files and directories currently installed.)
+(Reading database ... 11096 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.17-1_amd64.deb) ...
@@ -86,17 +86,17 @@ After unpacking 401kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 11734 files and directories currently installed.)
+(Reading database ... 11750 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
 Setting up fakeroot (1.5.8) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/28951/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/28951/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/12453/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/12453/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -418,7 +418,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 Apr  1 03:26:00 UTC 2006
+Mon Apr  3 03:48:00 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
@@ -488,14 +488,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 Apr  1 03:26:05 UTC 2006
+Mon Apr  3 03:48:05 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
+b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -618,7 +618,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 Apr  1 12:26:07 JST 2006
-pbuilder-time-stamp: 1143861967
+Current time: Mon Apr  3 12:48:08 JST 2006
+pbuilder-time-stamp: 1144036088
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/28951 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/12453 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-etch.log b/testsuite/cdebootstrap/pbuilder-create-etch.log
index f1b12aa..c3e8027 100644
--- a/testsuite/cdebootstrap/pbuilder-create-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-create-etch.log
@@ -61,8 +61,8 @@ P: Retrieving libwrap0
 P: Validating libwrap0
 P: Retrieving tcpd
 P: Validating tcpd
-P: Retrieving netkit-inetd
-P: Validating netkit-inetd
+P: Retrieving openbsd-inetd
+P: Validating openbsd-inetd
 P: Retrieving sed
 P: Validating sed
 P: Retrieving libncurses5
@@ -298,26 +298,24 @@ P: Configuring package base-passwd
 O: 
 P: Configuring helper cdebootstrap-helper-diverts
 O: Selecting previously deselected package cdebootstrap-helper-diverts.
-O: (Reading database ... 
-O: 24 files and directories currently installed.)
+O: (Reading database ... 24 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-diverts (from .../cdebootstrap-helper-diverts.deb) ...
 O: Adding `diversion of /sbin/start-stop-daemon to /sbin/start-stop-daemon.REAL by cdebootstrap-helper-diverts'
 O: Adding `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by cdebootstrap-helper-diverts'
 O: Setting up cdebootstrap-helper-diverts (1) ...
 P: Configuring helper cdebootstrap-helper-makedev
 O: Selecting previously deselected package cdebootstrap-helper-makedev.
-O: (Reading database ... 
-O: 29 files and directories currently installed.)
+O: (Reading database ... 29 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-makedev (from .../cdebootstrap-helper-makedev.deb) ...
 O: Setting up cdebootstrap-helper-makedev (1) ...
 O: 
 O: Selecting previously deselected package dpkg.
-O: dpkg: regarding .../dpkg_1.13.16_amd64.deb containing dpkg, pre-dependency problem:
+O: dpkg: regarding .../dpkg_1.13.17_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.16_amd64.deb) ...
+O: Unpacking dpkg (from .../dpkg_1.13.17_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:
@@ -325,14 +323,14 @@ 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.16) ...
+O: Setting up dpkg (1.13.17) ...
 P: Configuring package dpkg
 O: Adding `local diversion of /usr/bin/md5sum.textutils to /usr/bin/md5sum'
 O: Adding `local diversion of /usr/share/man/man1/md5sum.textutils.1.gz to /usr/share/man/man1/md5sum.1.gz'
 O: 
 O: Selecting previously deselected package libc6.
 O: (Reading database ... 
-O: 195 files and directories currently installed.)
+O: 196 files and directories currently installed.)
 O: Unpacking libc6 (from .../libc6_2.3.6-3_amd64.deb) ...
 P: Unpacking package libc6
 O: Selecting previously deselected package gcc-4.0-base.
@@ -562,7 +560,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.16_amd64.deb) ...
+O: Unpacking dselect (from .../dselect_1.13.17_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:
@@ -783,7 +781,7 @@ O:
 O: Setting up gzip (1.3.5-12) ...
 P: Configuring package gzip
 O: 
-O: Setting up dselect (1.13.16) ...
+O: Setting up dselect (1.13.17) ...
 P: Configuring package dselect
 O: Setting up bash (3.1-2) ...
 P: Configuring package bash
@@ -805,8 +803,7 @@ O:
 O: Setting up sysvinit (2.86.ds1-13) ...
 P: Configuring package sysvinit
 O: sysvinit: creating /dev/initctl
-O: init: 
-O: timeout opening/writing control channel /dev/initctl
+O: init: timeout opening/writing control channel /dev/initctl
 O: 
 O: Setting up debconf-i18n (1.4.72) ...
 P: Configuring package debconf-i18n
@@ -815,7 +812,7 @@ P: Configuring package debconf
 O: 
 O: Selecting previously deselected package apt.
 O: (Reading database ... 
-O: 4547 files and directories currently installed.)
+O: 4549 files and directories currently installed.)
 O: Unpacking apt (from .../apt_0.6.43.3_amd64.deb) ...
 P: Unpacking package apt
 O: Setting up apt (0.6.43.3) ...
@@ -824,13 +821,13 @@ O:
 P: Configuring helper cdebootstrap-helper-apt
 O: Selecting previously deselected package cdebootstrap-helper-apt.
 O: (Reading database ... 
-O: 4723 files and directories currently installed.)
+O: 4725 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 (50.2kB/s)
+O: Fetched 6091B in 0s (50.5kB/s)
 O: Reading package lists...
 O: 
 O: W: 
@@ -856,8 +853,8 @@ O:   dhcp3-common dmidecode ed exim4 exim4-base exim4-config exim4-daemon-light
 O:   groff-base ifupdown info iptables iputils-ping klogd laptop-detect libdb4.2
 O:   libgcrypt11 libgdbm3 libgnutls12 libgpg-error0 liblzo1 libncursesw5
 O:   libnewt0.51 libopencdk8 libpcre3 libpopt0 libsigc++-2.0-0c2a libssl0.9.8
-O:   libtasn1-2 libwrap0 logrotate man-db manpages nano net-tools netbase
-O:   netkit-inetd nvi psmisc sysklogd tasksel tcpd telnet wget whiptail
+O:   libtasn1-2 libwrap0 logrotate man-db manpages nano net-tools netbase nvi
+O:   openbsd-inetd psmisc sysklogd tasksel tcpd telnet wget whiptail
 O: 0 upgraded, 52 newly installed, 0 to remove and 0 not upgraded.
 O: Need to get 13.7MB of archives.
 O: After unpacking 40.5MB of additional disk space will be used.
@@ -866,13 +863,13 @@ O:   adduser apt-utils libncursesw5 libsigc++-2.0-0c2a aptitude bsdmainutils cpi
 O:   cron dmidecode ed groff-base net-tools ifupdown info iptables iputils-ping
 O:   sysklogd klogd laptop-detect libgpg-error0 libgcrypt11 libgdbm3 liblzo1
 O:   libopencdk8 libpopt0 libssl0.9.8 libtasn1-2 libwrap0 logrotate man-db
-O:   manpages nano netkit-inetd tcpd netbase nvi tasksel wget libnewt0.51
+O:   manpages nano openbsd-inetd tcpd netbase nvi tasksel wget libnewt0.51
 O:   whiptail libdb4.2 exim4-config exim4-base libgnutls12 libpcre3
 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: 4724 files and directories currently installed.)
+O: 4726 files and directories currently installed.)
 O: Unpacking adduser (from .../bootstrap/adduser_3.85_all.deb) ...
 P: Unpacking package adduser
 O: Selecting previously deselected package apt-utils.
@@ -968,14 +965,14 @@ P: Unpacking package manpages
 O: Selecting previously deselected package nano.
 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.3_amd64.deb) ...
-P: Unpacking package netkit-inetd
+O: Selecting previously deselected package openbsd-inetd.
+O: Unpacking openbsd-inetd (from .../openbsd-inetd_0.20050402-1_amd64.deb) ...
+P: Unpacking package openbsd-inetd
 O: Selecting previously deselected package tcpd.
 O: Unpacking tcpd (from .../tcpd_7.6.dbs-9_amd64.deb) ...
 P: Unpacking package tcpd
 O: Selecting previously deselected package netbase.
-O: Unpacking netbase (from .../bootstrap/netbase_4.24_all.deb) ...
+O: Unpacking netbase (from .../bootstrap/netbase_4.25_all.deb) ...
 P: Unpacking package netbase
 O: Selecting previously deselected package nvi.
 O: Unpacking nvi (from .../nvi_1.79-22_amd64.deb) ...
@@ -1120,15 +1117,9 @@ P: Configuring package manpages
 O: Setting up nano (1.3.10-2) ...
 P: Configuring package nano
 O: 
-O: Setting up netkit-inetd (0.10-10.3) ...
-P: Configuring package netkit-inetd
-O: 
 O: Setting up tcpd (7.6.dbs-9) ...
 P: Configuring package tcpd
 O: 
-O: Setting up netbase (4.24) ...
-P: Configuring package netbase
-O: 
 O: Setting up nvi (1.79-22) ...
 P: Configuring package nvi
 O: 
@@ -1157,26 +1148,12 @@ O: Adding system-user for exim (v4)
 O: chage: the shadow password file is not present
 O: chage failed with return code 15, shadow not enabled, password aging cannot be set. Continuing.
 O: 
-O: Setting up exim4-base (4.60-4) ...
-P: Configuring package exim4-base
-O: 
 O: Setting up libgnutls12 (1.2.9-2) ...
 P: Configuring package libgnutls12
 O: 
 O: Setting up libpcre3 (6.4-1.1) ...
 P: Configuring package libpcre3
 O: 
-O: Setting up exim4-daemon-light (4.60-4) ...
-P: Configuring package exim4-daemon-light
-O: 
-O: Setting up at (3.1.10) ...
-P: Configuring package at
-O: 
-O: Setting up exim4 (4.60-4) ...
-P: Configuring package exim4
-O: Setting up telnet (0.17-32) ...
-P: Configuring package telnet
-O: 
 O: Setting up dhcp3-common (3.0.3-6) ...
 P: Configuring package dhcp3-common
 O: Setting up dhcp3-client (3.0.3-6) ...
@@ -1185,28 +1162,48 @@ O:
 O: Setting up psmisc (22.2-1) ...
 P: Configuring package psmisc
 O: 
-O: Setting up sysklogd (1.4.1-17) ...
-P: Configuring package sysklogd
-O: 
 O: Setting up klogd (1.4.1-17) ...
 P: Configuring package klogd
 O: Stopping kernel log daemon: klogd
 O: .
 O: 
+O: Setting up sysklogd (1.4.1-17) ...
+P: Configuring package sysklogd
+O: 
+O: Setting up netbase (4.25) ...
+P: Configuring package netbase
+O: 
+O: Setting up openbsd-inetd (0.20050402-1) ...
+P: Configuring package openbsd-inetd
+O: 
+O: Setting up exim4-base (4.60-4) ...
+P: Configuring package exim4-base
+O: 
+O: Setting up exim4-daemon-light (4.60-4) ...
+P: Configuring package exim4-daemon-light
+O: 
+O: Setting up at (3.1.10) ...
+P: Configuring package at
+O: 
+O: Setting up exim4 (4.60-4) ...
+P: Configuring package exim4
+O: Setting up telnet (0.17-32) ...
+P: Configuring package telnet
+O: 
 P: Deconfiguring helper cdebootstrap-helper-apt
 O: (Reading database ... 
-O: 6678 files and directories currently installed.)
+O: 6679 files and directories currently installed.)
 O: Removing cdebootstrap-helper-apt ...
 P: Deconfiguring helper cdebootstrap-helper-diverts
 O: (Reading database ... 
-O: 6677 files and directories currently installed.)
+O: 6678 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: 6675 files and directories currently installed.)
+O: 6676 files and directories currently installed.)
 O: Removing cdebootstrap-helper-makedev ...
 O: Reading package lists...
 O: 
@@ -1219,18 +1216,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//15976/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//16569/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//15976/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//16569/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 [3724kB]
-Fetched 3730kB in 1s (1992kB/s)
+Get:3 http://ftp.jp.debian.org etch/main Packages [3730kB]
+Fetched 3736kB in 1s (2021kB/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
@@ -1257,14 +1254,14 @@ 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.1MB of archives.
-After unpacking 83.2MB of additional disk space will be used.
+Need to get 0B/20.9MB of archives.
+After unpacking 83.0MB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   binutils cpp-4.0 cpp perl-modules libdb4.4 perl patch make dpkg-dev gcc-4.0
   gcc linux-kernel-headers libc6-dev libstdc++6-4.0-dev g++-4.0 g++
   build-essential
 Selecting previously deselected package binutils.
-(Reading database ... 6675 files and directories currently installed.)
+(Reading database ... 6676 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.3-1_amd64.deb) ...
@@ -1279,9 +1276,9 @@ Unpacking perl (from .../perl_5.8.8-3_amd64.deb) ...
 Selecting previously deselected package patch.
 Unpacking patch (from .../patch_2.5.9-4_amd64.deb) ...
 Selecting previously deselected package make.
-Unpacking make (from .../make_3.80+3.81.rc1-1_amd64.deb) ...
+Unpacking make (from .../make_3.80+3.81.rc2-1_amd64.deb) ...
 Selecting previously deselected package dpkg-dev.
-Unpacking dpkg-dev (from .../dpkg-dev_1.13.16_all.deb) ...
+Unpacking dpkg-dev (from .../dpkg-dev_1.13.17_all.deb) ...
 Selecting previously deselected package gcc-4.0.
 Unpacking gcc-4.0 (from .../gcc-4.0_4.0.3-1_amd64.deb) ...
 Selecting previously deselected package gcc.
@@ -1305,8 +1302,7 @@ Setting up cpp (4.0.2-2) ...
 
 Setting up libdb4.4 (4.4.20-3) ...
 Setting up patch (2.5.9-4) ...
-Setting up make (3.80+3.81.rc1-1) ...
-
+Setting up make (3.80+3.81.rc2-1) ...
 Setting up gcc-4.0 (4.0.3-1) ...
 Setting up gcc (4.0.2-2) ...
 
@@ -1320,7 +1316,7 @@ Setting up g++ (4.0.2-2) ...
 
 Setting up perl (5.8.8-3) ...
 
-Setting up dpkg-dev (1.13.16) ...
+Setting up dpkg-dev (1.13.17) ...
 Setting up build-essential (11.2) ...
 Copying back the cached apt archive contents
 umount: /sys: not mounted
@@ -1329,9 +1325,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//15976/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//16569/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.tQtcio/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//15976 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//16569 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-sarge.log b/testsuite/cdebootstrap/pbuilder-create-sarge.log
index aeb36b5..80e22d6 100644
--- a/testsuite/cdebootstrap/pbuilder-create-sarge.log
+++ b/testsuite/cdebootstrap/pbuilder-create-sarge.log
@@ -747,8 +747,7 @@ O:
 O: Setting up sysvinit (2.86.ds1-1) ...
 P: Configuring package sysvinit
 O: sysvinit: creating /dev/initctl
-O: init: 
-O: timeout opening/writing control channel /dev/initctl
+O: init: timeout opening/writing control channel /dev/initctl
 O: 
 O: Setting up bash (2.05b-26) ...
 P: Configuring package bash
@@ -765,7 +764,8 @@ O: Unpacking cdebootstrap-helper-apt (from /cdebootstrap-helper-apt.deb) ...
 O: Setting up cdebootstrap-helper-apt (1) ...
 P: Configuring helper cdebootstrap-helper-diverts
 O: Selecting previously deselected package cdebootstrap-helper-diverts.
-O: (Reading database ... 4196 files and directories currently installed.)
+O: (Reading database ... 
+O: 4196 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'
@@ -788,7 +788,6 @@ O:
 O: Reading Package Lists...
 O: 
 O: Reading Package Lists...
-O: 
 O: Building Dependency Tree...
 O: 
 O: Suggested packages:
@@ -1217,16 +1216,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//17617/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//2566/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//17617/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//2566/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 (1995kB/s)
+Fetched 3223kB in 1s (1940kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -1313,9 +1312,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//17617/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//2566/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.tQtcio/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//17617 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//2566 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-sid.log b/testsuite/cdebootstrap/pbuilder-create-sid.log
index d8711bf..c6a979d 100644
--- a/testsuite/cdebootstrap/pbuilder-create-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-create-sid.log
@@ -10,8 +10,8 @@ P: Validating Packages
 P: Parsing Packages
 P: Retrieving libc6
 P: Validating libc6
-P: Retrieving gcc-4.0-base
-P: Validating gcc-4.0-base
+P: Retrieving gcc-4.1-base
+P: Validating gcc-4.1-base
 P: Retrieving libgcc1
 P: Validating libgcc1
 P: Retrieving libstdc++6
@@ -190,8 +190,12 @@ P: Retrieving base-files
 P: Validating base-files
 P: Retrieving bash
 P: Validating bash
+P: Retrieving gcc-4.0-base
+P: Validating gcc-4.0-base
 P: Retrieving grep
 P: Validating grep
+P: Retrieving libdevmapper1.02
+P: Validating libdevmapper1.02
 P: Retrieving procps
 P: Validating procps
 P: Retrieving libcomerr2
@@ -231,7 +235,7 @@ P: Validating findutils
 P: Retrieving util-linux
 P: Validating util-linux
 P: Extracting libc6
-P: Extracting gcc-4.0-base
+P: Extracting gcc-4.1-base
 P: Extracting libgcc1
 P: Extracting libstdc++6
 P: Extracting libdb4.3
@@ -268,7 +272,9 @@ P: Extracting hostname
 P: Extracting mawk
 P: Extracting base-files
 P: Extracting bash
+P: Extracting gcc-4.0-base
 P: Extracting grep
+P: Extracting libdevmapper1.02
 P: Extracting procps
 P: Extracting libcomerr2
 P: Extracting dselect
@@ -335,14 +341,14 @@ O: (Reading database ...
 O: 192 files and directories currently installed.)
 O: Unpacking libc6 (from .../libc6_2.3.6-4_amd64.deb) ...
 P: Unpacking package libc6
-O: Selecting previously deselected package gcc-4.0-base.
-O: Unpacking gcc-4.0-base (from .../gcc-4.0-base_4.0.3-1_amd64.deb) ...
-P: Unpacking package gcc-4.0-base
+O: Selecting previously deselected package gcc-4.1-base.
+O: Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1.0-1_amd64.deb) ...
+P: Unpacking package gcc-4.1-base
 O: Selecting previously deselected package libgcc1.
-O: Unpacking libgcc1 (from .../libgcc1_4.0.3-1_amd64.deb) ...
+O: Unpacking libgcc1 (from .../libgcc1_4.1.0-1_amd64.deb) ...
 P: Unpacking package libgcc1
 O: Selecting previously deselected package libstdc++6.
-O: Unpacking libstdc++6 (from .../libstdc++6_4.0.3-1_amd64.deb) ...
+O: Unpacking libstdc++6 (from .../libstdc++6_4.1.0-1_amd64.deb) ...
 P: Unpacking package libstdc++6
 O: Selecting previously deselected package libdb4.3.
 O: Unpacking libdb4.3 (from .../libdb4.3_4.3.29-5_amd64.deb) ...
@@ -522,6 +528,9 @@ O:   libncurses5 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking bash (from .../bootstrap/bash_3.1-4_amd64.deb) ...
 P: Unpacking package bash
+O: Selecting previously deselected package gcc-4.0-base.
+O: Unpacking gcc-4.0-base (from .../gcc-4.0-base_4.0.3-1_amd64.deb) ...
+P: Unpacking package gcc-4.0-base
 O: Selecting previously deselected package grep.
 O: dpkg: regarding .../grep_2.5.1.ds2-4_amd64.deb containing grep, pre-dependency problem:
 O:  grep pre-depends on libc6 (>= 2.3.5-1)
@@ -529,6 +538,9 @@ O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking grep (from .../grep_2.5.1.ds2-4_amd64.deb) ...
 P: Unpacking package grep
+O: Selecting previously deselected package libdevmapper1.02.
+O: Unpacking libdevmapper1.02 (from .../libdevmapper1.02_1.02.03-1_amd64.deb) ...
+P: Unpacking package libdevmapper1.02
 O: Selecting previously deselected package procps.
 O: Unpacking procps (from .../procps_3.2.6-2.1_amd64.deb) ...
 P: Unpacking package procps
@@ -675,6 +687,9 @@ O:
 O: Setting up gcc-4.0-base (4.0.3-1) ...
 P: Configuring package gcc-4.0-base
 O: 
+O: Setting up gcc-4.1-base (4.1.0-1) ...
+P: Configuring package gcc-4.1-base
+O: 
 O: Setting up libpam-runtime (0.79-3.1) ...
 P: Configuring package libpam-runtime
 O: 
@@ -706,7 +721,7 @@ O:
 O: Setting up zlib1g (1.2.3-11) ...
 P: Configuring package zlib1g
 O: 
-O: Setting up libgcc1 (4.0.3-1) ...
+O: Setting up libgcc1 (4.1.0-1) ...
 P: Configuring package libgcc1
 O: 
 O: Setting up libtext-iconv-perl (1.4-2) ...
@@ -760,9 +775,12 @@ P: Configuring package diff
 O: Setting up libselinux1 (1.30-1) ...
 P: Configuring package libselinux1
 O: 
-O: Setting up libstdc++6 (4.0.3-1) ...
+O: Setting up libstdc++6 (4.1.0-1) ...
 P: Configuring package libstdc++6
 O: 
+O: Setting up libdevmapper1.02 (1.02.03-1) ...
+P: Configuring package libdevmapper1.02
+O: 
 O: Setting up libtext-charwidth-perl (0.04-3) ...
 P: Configuring package libtext-charwidth-perl
 O: Setting up libtext-wrapi18n-perl (0.06-4) ...
@@ -817,8 +835,7 @@ O:
 O: Setting up sysvinit (2.86.ds1-14) ...
 P: Configuring package sysvinit
 O: sysvinit: creating /dev/initctl
-O: init: 
-O: timeout opening/writing control channel /dev/initctl
+O: init: timeout opening/writing control channel /dev/initctl
 O: 
 O: Setting up debconf-i18n (1.4.72) ...
 P: Configuring package debconf-i18n
@@ -827,7 +844,7 @@ P: Configuring package debconf
 O: 
 O: Selecting previously deselected package apt.
 O: (Reading database ... 
-O: 4660 files and directories currently installed.)
+O: 4674 files and directories currently installed.)
 O: Unpacking apt (from .../apt_0.6.43.3_amd64.deb) ...
 P: Unpacking package apt
 O: Setting up apt (0.6.43.3) ...
@@ -836,13 +853,13 @@ O:
 P: Configuring helper cdebootstrap-helper-apt
 O: Selecting previously deselected package cdebootstrap-helper-apt.
 O: (Reading database ... 
-O: 4834 files and directories currently installed.)
+O: 4848 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 (38.0kB/s)
+O: Fetched 6091B in 0s (47.2kB/s)
 O: Reading package lists...
 O: 
 O: W: 
@@ -852,9 +869,7 @@ O: W:
 O: You may want to run apt-get update to correct these problems
 O: 
 O: Reading package lists...
-O: 
 O: Building dependency tree...
-O: 
 O: Suggested packages:
 O:   perl-modules libparse-debianchangelog-perl debtags cpp wenglish wordlist
 O:   whois vacation anacron lockfile-progs checksecurity resolvconf mail-reader
@@ -884,7 +899,7 @@ O:   telnet dhcp3-common dhcp3-client psmisc
 O: Authentication warning overridden.
 O: Selecting previously deselected package adduser.
 O: (Reading database ... 
-O: 4835 files and directories currently installed.)
+O: 4849 files and directories currently installed.)
 O: Unpacking adduser (from .../bootstrap/adduser_3.85_all.deb) ...
 P: Unpacking package adduser
 O: Selecting previously deselected package apt-utils.
@@ -975,7 +990,7 @@ O: Selecting previously deselected package man-db.
 O: Unpacking man-db (from .../man-db_2.4.3-3_amd64.deb) ...
 P: Unpacking package man-db
 O: Selecting previously deselected package manpages.
-O: Unpacking manpages (from .../manpages_2.22-1_all.deb) ...
+O: Unpacking manpages (from .../manpages_2.23-1_all.deb) ...
 P: Unpacking package manpages
 O: Selecting previously deselected package nano.
 O: Unpacking nano (from .../nano_1.3.11-1_amd64.deb) ...
@@ -1124,7 +1139,7 @@ O: Setting up man-db (2.4.3-3) ...
 P: Configuring package man-db
 O: Building database of manual pages ...
 O: 
-O: Setting up manpages (2.22-1) ...
+O: Setting up manpages (2.23-1) ...
 P: Configuring package manpages
 O: Setting up nano (1.3.11-1) ...
 P: Configuring package nano
@@ -1201,18 +1216,18 @@ P: Configuring package telnet
 O: 
 P: Deconfiguring helper cdebootstrap-helper-apt
 O: (Reading database ... 
-O: 6719 files and directories currently installed.)
+O: 6735 files and directories currently installed.)
 O: Removing cdebootstrap-helper-apt ...
 P: Deconfiguring helper cdebootstrap-helper-diverts
 O: (Reading database ... 
-O: 6718 files and directories currently installed.)
+O: 6734 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: 6716 files and directories currently installed.)
+O: 6732 files and directories currently installed.)
 O: Removing cdebootstrap-helper-makedev ...
 O: Reading package lists...
 O: 
@@ -1225,18 +1240,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//24027/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//26078/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//24027/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//26078/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 [5902B]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [4015kB]
-Fetched 4021kB in 1s (2036kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [4028kB]
+Fetched 4034kB in 33s (121kB/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
@@ -1270,7 +1285,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 ... 6716 files and directories currently installed.)
+(Reading database ... 6732 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.3-1_amd64.deb) ...
@@ -1334,9 +1349,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//24027/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//26078/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.tQtcio/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//24027 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//26078 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-etch.log b/testsuite/cdebootstrap/pbuilder-execute-etch.log
index e870bb7..34a87ce 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.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//8741/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//23201/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//8741 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//23201 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-sarge.log b/testsuite/cdebootstrap/pbuilder-execute-sarge.log
index 1c6850a..69af107 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.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//8084/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//7247/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//8084 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//7247 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-sid.log b/testsuite/cdebootstrap/pbuilder-execute-sid.log
index d2be24e..a88dad4 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.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//16790/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//1724/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//16790 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//1724 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
index 0157e1a..5e597e7 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.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//11451/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//25918/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 [5902B]
 Ign http://ftp.jp.debian.org sid Release
-Get:5 http://ftp.jp.debian.org experimental/main Packages [154kB]
+Get:5 http://ftp.jp.debian.org experimental/main Packages [158kB]
 Hit http://ftp.jp.debian.org sid/main Packages
-Fetched 164kB in 0s (674kB/s)
+Fetched 169kB in 0s (777kB/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?)
@@ -29,35 +29,24 @@ dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
 Reading package lists...
 Building dependency tree...
-The following NEW packages will be installed:
-  gcc-4.1-base
 The following packages have been kept back:
   apt apt-utils
 The following packages will be upgraded:
-  aptitude diff libgcc1 libstdc++6
-4 upgraded, 1 newly installed, 0 to remove and 2 not upgraded.
-Need to get 0B/3365kB of archives.
-After unpacking 565kB of additional disk space will be used.
+  aptitude diff lsb-base
+3 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.
+Need to get 0B/2876kB of archives.
+After unpacking 303kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
-  diff gcc-4.1-base libgcc1 libstdc++6 aptitude
-(Reading database ... 11083 files and directories currently installed.)
+  diff lsb-base aptitude
+(Reading database ... 11090 files and directories currently installed.)
 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 ... 11091 files and directories currently installed.)
-Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1.0-0_amd64.deb) ...
-Preparing to replace libgcc1 1:4.0.3-1 (using .../libgcc1_1%3a4.1.0-0_amd64.deb) ...
-Unpacking replacement libgcc1 ...
-Setting up gcc-4.1-base (4.1.0-0) ...
-Setting up libgcc1 (4.1.0-0) ...
-
-(Reading database ... 11097 files and directories currently installed.)
-Preparing to replace libstdc++6 4.0.3-1 (using .../libstdc++6_4.1.0-0_amd64.deb) ...
-Unpacking replacement libstdc++6 ...
-Setting up libstdc++6 (4.1.0-0) ...
-
-(Reading database ... 11097 files and directories currently installed.)
+(Reading database ... 11098 files and directories currently installed.)
+Preparing to replace lsb-base 3.0-16 (using .../lsb-base_3.1-1_all.deb) ...
+Unpacking replacement lsb-base ...
+Setting up lsb-base (3.1-1) ...
+(Reading database ... 11098 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 aptitude (0.4.1-1experimental1) ...
@@ -81,10 +70,10 @@ Need to get 0B/1535kB of archives.
 After unpacking 9683kB disk space will be freed.
 WARNING: The following packages cannot be authenticated!
   apt-utils apt
-(Reading database ... 11097 files and directories currently installed.)
+(Reading database ... 11098 files and directories currently installed.)
 Removing tasksel ...
 Removing aptitude ...
-(Reading database ... 10892 files and directories currently installed.)
+(Reading database ... 10893 files and directories currently installed.)
 Preparing to replace apt-utils 0.6.43.3 (using .../apt-utils_0.6.43.3exp1_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Preparing to replace apt 0.6.43.3 (using .../apt_0.6.43.3exp1_amd64.deb) ...
@@ -100,9 +89,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//11451/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//25918/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.tQtcio/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//11451 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//25918 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
index 698b9d8..2c43fd4 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.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//9566/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//24044/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 [5902B]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [4015kB]
-Fetched 4021kB in 11s (365kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [4028kB]
+Fetched 4034kB in 2s (1955kB/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,45 +25,45 @@ Building dependency tree...
 The following packages will be REMOVED:
   libnewt0.51
 The following NEW packages will be installed:
-  libnewt0.52
+  gcc-4.1-base libnewt0.52
 The following packages will be upgraded:
-  bash coreutils cpp dhcp3-client dhcp3-common dmidecode dpkg dpkg-dev dselect
-  exim4 exim4-base exim4-config exim4-daemon-light g++ gcc info initscripts
-  klogd libacl1 libattr1 libc6 libc6-dev libdb4.2 libdb4.3 libdb4.4
-  libselinux1 libsepol1 libslang2 libssl0.9.8 login make nano netbase passwd
+  bash coreutils cpp dhcp3-client dhcp3-common dmidecode exim4 exim4-base
+  exim4-config exim4-daemon-light g++ gcc info initscripts klogd libacl1
+  libattr1 libc6 libc6-dev libdb4.2 libdb4.3 libdb4.4 libgcc1 libselinux1
+  libsepol1 libslang2 libssl0.9.8 libstdc++6 login manpages nano passwd
   sysklogd sysv-rc sysvinit whiptail
-38 upgraded, 1 newly installed, 1 to remove and 0 not upgraded.
-Need to get 0B/21.2MB of archives.
-After unpacking 1569kB of additional disk space will be used.
+36 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
+Need to get 0B/19.5MB of archives.
+After unpacking 1810kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
-  libc6-dev libc6 libslang2 whiptail libnewt0.52 bash dpkg coreutils login
-  libsepol1 libselinux1 sysvinit initscripts libattr1 libacl1 sysv-rc
-  dmidecode info sysklogd klogd libssl0.9.8 nano netbase dselect libdb4.3
-  passwd cpp make dpkg-dev libdb4.2 exim4-config exim4-base exim4-daemon-light
-  exim4 gcc g++ libdb4.4 dhcp3-client dhcp3-common
-(Reading database ... 11041 files and directories currently installed.)
+  libc6-dev libc6 libslang2 whiptail libnewt0.52 bash coreutils login
+  libsepol1 libselinux1 sysvinit initscripts libattr1 libacl1 gcc-4.1-base
+  libgcc1 libstdc++6 sysv-rc dmidecode info sysklogd klogd libssl0.9.8
+  manpages nano libdb4.3 passwd cpp libdb4.2 exim4-config exim4-base
+  exim4-daemon-light exim4 gcc g++ libdb4.4 dhcp3-client dhcp3-common
+(Reading database ... 11040 files and directories currently installed.)
 Preparing to replace libc6-dev 2.3.6-3 (using .../libc6-dev_2.3.6-4_amd64.deb) ...
 Unpacking replacement libc6-dev ...
 Preparing to replace libc6 2.3.6-3 (using .../libc6_2.3.6-4_amd64.deb) ...
 Unpacking replacement libc6 ...
 Setting up libc6 (2.3.6-4) ...
 Current default timezone: 'UTC'.
-Local time is now:      Sat Apr  1 03:46:08 UTC 2006.
-Universal Time is now:  Sat Apr  1 03:46:08 UTC 2006.
+Local time is now:      Mon Apr  3 04:07:18 UTC 2006.
+Universal Time is now:  Mon Apr  3 04:07:18 UTC 2006.
 Run 'tzconfig' if you wish to change it.
 
-(Reading database ... 11042 files and directories currently installed.)
+(Reading database ... 11041 files and directories currently installed.)
 Preparing to replace libslang2 2.0.5-3 (using .../libslang2_2.0.6-2_amd64.deb) ...
 Unpacking replacement libslang2 ...
 Setting up libslang2 (2.0.6-2) ...
 
-(Reading database ... 11042 files and directories currently installed.)
+(Reading database ... 11041 files and directories currently installed.)
 Preparing to replace whiptail 0.51.6-31 (using .../whiptail_0.52.2-3_amd64.deb) ...
 Unpacking replacement whiptail ...
-(Reading database ... 11041 files and directories currently installed.)
+(Reading database ... 11040 files and directories currently installed.)
 Removing libnewt0.51 ...
 Selecting previously deselected package libnewt0.52.
-(Reading database ... 10980 files and directories currently installed.)
+(Reading database ... 10979 files and directories currently installed.)
 Unpacking libnewt0.52 (from .../libnewt0.52_0.52.2-3_amd64.deb) ...
 Preparing to replace bash 3.1-2 (using .../archives/bash_3.1-4_amd64.deb) ...
 Unpacking replacement bash ...
@@ -71,48 +71,43 @@ Setting up bash (3.1-4) ...
 Installing new version of config file /etc/bash_completion ...
 Installing new version of config file /etc/skel/.bashrc ...
 
-(Reading database ... 11050 files and directories currently installed.)
-Preparing to replace dpkg 1.13.16 (using .../dpkg_1.13.17_amd64.deb) ...
-Unpacking replacement dpkg ...
-Setting up dpkg (1.13.17) ...
-
-(Reading database ... 11054 files and directories currently installed.)
+(Reading database ... 11049 files and directories currently installed.)
 Preparing to replace coreutils 5.2.1-2.1 (using .../coreutils_5.94-1_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.94-1) ...
 
-(Reading database ... 11074 files and directories currently installed.)
+(Reading database ... 11069 files and directories currently installed.)
 Preparing to replace login 1:4.0.14-9 (using .../login_1%3a4.0.15-1_amd64.deb) ...
 Unpacking replacement login ...
 Setting up login (4.0.15-1) ...
 Installing new version of config file /etc/pam.d/login ...
 Installing new version of config file /etc/pam.d/su ...
 
-(Reading database ... 11079 files and directories currently installed.)
+(Reading database ... 11074 files and directories currently installed.)
 Preparing to replace libsepol1 1.10-2 (using .../libsepol1_1.12-1_amd64.deb) ...
 Unpacking replacement libsepol1 ...
 Setting up libsepol1 (1.12-1) ...
 
-(Reading database ... 11079 files and directories currently installed.)
+(Reading database ... 11074 files and directories currently installed.)
 Preparing to replace libselinux1 1.28-4 (using .../libselinux1_1.30-1_amd64.deb) ...
 Unpacking replacement libselinux1 ...
 Setting up libselinux1 (1.30-1) ...
 
-(Reading database ... 11079 files and directories currently installed.)
+(Reading database ... 11074 files and directories currently installed.)
 Preparing to replace sysvinit 2.86.ds1-13 (using .../sysvinit_2.86.ds1-14_amd64.deb) ...
 Unpacking replacement sysvinit ...
 Setting up sysvinit (2.86.ds1-14) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 11079 files and directories currently installed.)
+(Reading database ... 11074 files and directories currently installed.)
 Preparing to replace initscripts 2.86.ds1-13 (using .../initscripts_2.86.ds1-14_amd64.deb) ...
 Unpacking replacement initscripts ...
 Setting up initscripts (2.86.ds1-14) ...
 Installing new version of config file /etc/init.d/umountfs ...
 
-(Reading database ... 11079 files and directories currently installed.)
+(Reading database ... 11074 files and directories currently installed.)
 Preparing to replace libattr1 2.4.31-1 (using .../libattr1_2.4.32-1_amd64.deb) ...
 Unpacking replacement libattr1 ...
 Preparing to replace libacl1 2.2.35-1 (using .../libacl1_2.2.36-1_amd64.deb) ...
@@ -121,12 +116,26 @@ Setting up libattr1 (2.4.32-1) ...
 
 Setting up libacl1 (2.2.36-1) ...
 
-(Reading database ... 11079 files and directories currently installed.)
+Selecting previously deselected package gcc-4.1-base.
+(Reading database ... 11074 files and directories currently installed.)
+Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1.0-1_amd64.deb) ...
+Preparing to replace libgcc1 1:4.0.3-1 (using .../libgcc1_1%3a4.1.0-1_amd64.deb) ...
+Unpacking replacement libgcc1 ...
+Setting up gcc-4.1-base (4.1.0-1) ...
+
+Setting up libgcc1 (4.1.0-1) ...
+
+(Reading database ... 11082 files and directories currently installed.)
+Preparing to replace libstdc++6 4.0.3-1 (using .../libstdc++6_4.1.0-1_amd64.deb) ...
+Unpacking replacement libstdc++6 ...
+Setting up libstdc++6 (4.1.0-1) ...
+
+(Reading database ... 11082 files and directories currently installed.)
 Preparing to replace sysv-rc 2.86.ds1-13 (using .../sysv-rc_2.86.ds1-14_all.deb) ...
 Unpacking replacement sysv-rc ...
 Setting up sysv-rc (2.86.ds1-14) ...
 
-(Reading database ... 11079 files and directories currently installed.)
+(Reading database ... 11082 files and directories currently installed.)
 Preparing to replace dmidecode 2.8-1 (using .../dmidecode_2.8-2_amd64.deb) ...
 Unpacking replacement dmidecode ...
 Preparing to replace info 4.8-6 (using .../archives/info_4.8-8_amd64.deb) ...
@@ -137,22 +146,16 @@ Preparing to replace klogd 1.4.1-17 (using .../klogd_1.4.1-17.1_amd64.deb) ...
 Unpacking replacement klogd ...
 Preparing to replace libssl0.9.8 0.9.8a-7 (using .../libssl0.9.8_0.9.8a-8_amd64.deb) ...
 Unpacking replacement libssl0.9.8 ...
+Preparing to replace manpages 2.22-1 (using .../manpages_2.23-1_all.deb) ...
+Unpacking replacement manpages ...
 Preparing to replace nano 1.3.10-2 (using .../nano_1.3.11-1_amd64.deb) ...
 Unpacking replacement nano ...
-Preparing to replace netbase 4.24 (using .../archives/netbase_4.25_all.deb) ...
-Unpacking replacement netbase ...
-Preparing to replace dselect 1.13.16 (using .../dselect_1.13.17_amd64.deb) ...
-Unpacking replacement dselect ...
 Preparing to replace libdb4.3 4.3.29-4.1 (using .../libdb4.3_4.3.29-5_amd64.deb) ...
 Unpacking replacement libdb4.3 ...
 Preparing to replace passwd 1:4.0.14-9 (using .../passwd_1%3a4.0.15-1_amd64.deb) ...
 Unpacking replacement passwd ...
 Preparing to replace cpp 4:4.0.2-2 (using .../cpp_4%3a4.0.3-1_amd64.deb) ...
 Unpacking replacement cpp ...
-Preparing to replace make 3.80+3.81.rc1-1 (using .../make_3.80+3.81.rc2-1_amd64.deb) ...
-Unpacking replacement make ...
-Preparing to replace dpkg-dev 1.13.16 (using .../dpkg-dev_1.13.17_all.deb) ...
-Unpacking replacement dpkg-dev ...
 Preparing to replace libdb4.2 4.2.52-23.1 (using .../libdb4.2_4.2.52-24_amd64.deb) ...
 Unpacking replacement libdb4.2 ...
 Preparing to replace exim4-config 4.60-4 (using .../exim4-config_4.60-5_all.deb) ...
@@ -183,19 +186,14 @@ Setting up info (4.8-8) ...
 
 Setting up libssl0.9.8 (0.9.8a-8) ...
 
+Setting up manpages (2.23-1) ...
 Setting up nano (1.3.11-1) ...
 
-Setting up netbase (4.25) ...
-Installing new version of config file /etc/services ...
-
-Setting up dselect (1.13.17) ...
 Setting up libdb4.3 (4.3.29-5) ...
 Setting up passwd (4.0.15-1) ...
 
 Setting up cpp (4.0.3-1) ...
 
-Setting up make (3.80+3.81.rc2-1) ...
-Setting up dpkg-dev (1.13.17) ...
 Setting up libdb4.2 (4.2.52-24) ...
 Setting up exim4-config (4.60-5) ...
 Installing new version of config file /etc/exim4/conf.d/acl/20_exim4-config_whitelist_local_deny ...
@@ -233,9 +231,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//9566/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//24044/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.tQtcio/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//9566 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//24044 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 8f9b472..3fc57b1 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.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//14993/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//15602/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 [5902B]
 Ign http://ftp.jp.debian.org sid Release
-Get:5 http://ftp.jp.debian.org experimental/main Packages [154kB]
+Get:5 http://ftp.jp.debian.org experimental/main Packages [158kB]
 Hit http://ftp.jp.debian.org sid/main Packages
-Fetched 164kB in 0s (336kB/s)
+Fetched 169kB in 0s (462kB/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?)
@@ -29,35 +29,24 @@ dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
 Reading package lists...
 Building dependency tree...
-The following NEW packages will be installed:
-  gcc-4.1-base
 The following packages have been kept back:
   apt apt-utils
 The following packages will be upgraded:
-  aptitude diff gettext-base libgcc1 libstdc++6
-5 upgraded, 1 newly installed, 0 to remove and 2 not upgraded.
-Need to get 0B/3468kB of archives.
-After unpacking 578kB of additional disk space will be used.
+  aptitude diff gettext-base lsb-base
+4 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.
+Need to get 0B/2979kB of archives.
+After unpacking 315kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
-  diff gcc-4.1-base libgcc1 libstdc++6 aptitude gettext-base
-(Reading database ... 12339 files and directories currently installed.)
+  diff lsb-base aptitude gettext-base
+(Reading database ... 12349 files and directories currently installed.)
 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 ... 12347 files and directories currently installed.)
-Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1.0-0_amd64.deb) ...
-Preparing to replace libgcc1 1:4.0.3-1 (using .../libgcc1_1%3a4.1.0-0_amd64.deb) ...
-Unpacking replacement libgcc1 ...
-Setting up gcc-4.1-base (4.1.0-0) ...
-Setting up libgcc1 (4.1.0-0) ...
-
-(Reading database ... 12353 files and directories currently installed.)
-Preparing to replace libstdc++6 4.0.3-1 (using .../libstdc++6_4.1.0-0_amd64.deb) ...
-Unpacking replacement libstdc++6 ...
-Setting up libstdc++6 (4.1.0-0) ...
-
-(Reading database ... 12353 files and directories currently installed.)
+(Reading database ... 12357 files and directories currently installed.)
+Preparing to replace lsb-base 3.0-16 (using .../lsb-base_3.1-1_all.deb) ...
+Unpacking replacement lsb-base ...
+Setting up lsb-base (3.1-1) ...
+(Reading database ... 12357 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) ...
@@ -85,10 +74,10 @@ Need to get 0B/1535kB of archives.
 After unpacking 9683kB disk space will be freed.
 WARNING: The following packages cannot be authenticated!
   apt-utils apt
-(Reading database ... 12353 files and directories currently installed.)
+(Reading database ... 12357 files and directories currently installed.)
 Removing tasksel ...
 Removing aptitude ...
-(Reading database ... 12148 files and directories currently installed.)
+(Reading database ... 12152 files and directories currently installed.)
 Preparing to replace apt-utils 0.6.43.3 (using .../apt-utils_0.6.43.3exp1_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Preparing to replace apt 0.6.43.3 (using .../apt_0.6.43.3exp1_amd64.deb) ...
@@ -104,9 +93,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//14993/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//15602/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.tQtcio/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//14993 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//15602 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log b/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log
index 2cf3ed0..efea5c6 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.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//13051/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//13617/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 [5902B]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [4015kB]
-Fetched 4021kB in 2s (1720kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [4028kB]
+Fetched 4034kB in 2s (1888kB/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,47 +25,46 @@ Building dependency tree...
 The following packages will be REMOVED:
   libnewt0.51
 The following NEW packages will be installed:
-  libnewt0.52
+  gcc-4.1-base libnewt0.52
 The following packages will be upgraded:
   base-config bash console-data coreutils cpp dhcp3-client dhcp3-common
-  dmidecode dpkg dpkg-dev dselect exim4 exim4-base exim4-config
-  exim4-daemon-light g++ gcc info initscripts klogd libacl1 libattr1 libc6
-  libc6-dev libdb3 libdb4.2 libdb4.3 libdb4.4 libselinux1 libsepol1 libslang2
-  libssl0.9.8 login make nano netbase passwd sysklogd sysv-rc sysvinit
-  whiptail
-41 upgraded, 1 newly installed, 1 to remove and 0 not upgraded.
-Need to get 0B/22.8MB of archives.
-After unpacking 1368kB of additional disk space will be used.
+  dmidecode exim4 exim4-base exim4-config exim4-daemon-light g++ gcc info
+  initscripts klogd libacl1 libattr1 libc6 libc6-dev libdb4.2 libdb4.3
+  libdb4.4 libgcc1 libselinux1 libsepol1 libslang2 libssl0.9.8 libstdc++6
+  login manpages nano passwd sysklogd sysv-rc sysvinit whiptail
+38 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
+Need to get 0B/20.9MB of archives.
+After unpacking 1606kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
-  libc6-dev libc6 libslang2 whiptail libnewt0.52 bash dpkg coreutils login
-  libsepol1 libselinux1 sysvinit initscripts libattr1 libacl1 sysv-rc
-  dmidecode info sysklogd klogd libssl0.9.8 nano netbase dselect libdb4.3
-  passwd cpp make dpkg-dev libdb4.2 exim4-config exim4-base exim4-daemon-light
-  exim4 gcc g++ libdb4.4 console-data dhcp3-client dhcp3-common libdb3
-  base-config
-(Reading database ... 12411 files and directories currently installed.)
+  libc6-dev libc6 libslang2 whiptail libnewt0.52 bash coreutils login
+  libsepol1 libselinux1 sysvinit initscripts libattr1 libacl1 gcc-4.1-base
+  libgcc1 libstdc++6 sysv-rc dmidecode info sysklogd klogd libssl0.9.8
+  manpages nano libdb4.3 passwd cpp libdb4.2 exim4-config exim4-base
+  exim4-daemon-light exim4 gcc g++ libdb4.4 console-data dhcp3-client
+  dhcp3-common base-config
+(Reading database ... 12413 files and directories currently installed.)
 Preparing to replace libc6-dev 2.3.6-3 (using .../libc6-dev_2.3.6-4_amd64.deb) ...
 Unpacking replacement libc6-dev ...
 Preparing to replace libc6 2.3.6-3 (using .../libc6_2.3.6-4_amd64.deb) ...
 Unpacking replacement libc6 ...
 Setting up libc6 (2.3.6-4) ...
 Current default timezone: 'UTC'.
-Local time is now:      Sat Apr  1 03:37:17 UTC 2006.
-Universal Time is now:  Sat Apr  1 03:37:17 UTC 2006.
+Local time is now:      Mon Apr  3 03:59:22 UTC 2006.
+Universal Time is now:  Mon Apr  3 03:59:22 UTC 2006.
 Run 'tzconfig' if you wish to change it.
 
-(Reading database ... 12412 files and directories currently installed.)
+(Reading database ... 12414 files and directories currently installed.)
 Preparing to replace libslang2 2.0.5-3 (using .../libslang2_2.0.6-2_amd64.deb) ...
 Unpacking replacement libslang2 ...
 Setting up libslang2 (2.0.6-2) ...
 
-(Reading database ... 12412 files and directories currently installed.)
+(Reading database ... 12414 files and directories currently installed.)
 Preparing to replace whiptail 0.51.6-31 (using .../whiptail_0.52.2-3_amd64.deb) ...
 Unpacking replacement whiptail ...
-(Reading database ... 12411 files and directories currently installed.)
+(Reading database ... 12413 files and directories currently installed.)
 Removing libnewt0.51 ...
 Selecting previously deselected package libnewt0.52.
-(Reading database ... 12350 files and directories currently installed.)
+(Reading database ... 12352 files and directories currently installed.)
 Unpacking libnewt0.52 (from .../libnewt0.52_0.52.2-3_amd64.deb) ...
 Preparing to replace bash 3.1-2 (using .../archives/bash_3.1-4_amd64.deb) ...
 Unpacking replacement bash ...
@@ -73,48 +72,43 @@ Setting up bash (3.1-4) ...
 Installing new version of config file /etc/bash_completion ...
 Installing new version of config file /etc/skel/.bashrc ...
 
-(Reading database ... 12420 files and directories currently installed.)
-Preparing to replace dpkg 1.13.16 (using .../dpkg_1.13.17_amd64.deb) ...
-Unpacking replacement dpkg ...
-Setting up dpkg (1.13.17) ...
-
-(Reading database ... 12424 files and directories currently installed.)
+(Reading database ... 12422 files and directories currently installed.)
 Preparing to replace coreutils 5.2.1-2.1 (using .../coreutils_5.94-1_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.94-1) ...
 
-(Reading database ... 12444 files and directories currently installed.)
+(Reading database ... 12442 files and directories currently installed.)
 Preparing to replace login 1:4.0.14-9 (using .../login_1%3a4.0.15-1_amd64.deb) ...
 Unpacking replacement login ...
 Setting up login (4.0.15-1) ...
 Installing new version of config file /etc/pam.d/login ...
 Installing new version of config file /etc/pam.d/su ...
 
-(Reading database ... 12449 files and directories currently installed.)
+(Reading database ... 12447 files and directories currently installed.)
 Preparing to replace libsepol1 1.10-2 (using .../libsepol1_1.12-1_amd64.deb) ...
 Unpacking replacement libsepol1 ...
 Setting up libsepol1 (1.12-1) ...
 
-(Reading database ... 12449 files and directories currently installed.)
+(Reading database ... 12447 files and directories currently installed.)
 Preparing to replace libselinux1 1.28-4 (using .../libselinux1_1.30-1_amd64.deb) ...
 Unpacking replacement libselinux1 ...
 Setting up libselinux1 (1.30-1) ...
 
-(Reading database ... 12449 files and directories currently installed.)
+(Reading database ... 12447 files and directories currently installed.)
 Preparing to replace sysvinit 2.86.ds1-13 (using .../sysvinit_2.86.ds1-14_amd64.deb) ...
 Unpacking replacement sysvinit ...
 Setting up sysvinit (2.86.ds1-14) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 12449 files and directories currently installed.)
+(Reading database ... 12447 files and directories currently installed.)
 Preparing to replace initscripts 2.86.ds1-13 (using .../initscripts_2.86.ds1-14_amd64.deb) ...
 Unpacking replacement initscripts ...
 Setting up initscripts (2.86.ds1-14) ...
 Installing new version of config file /etc/init.d/umountfs ...
 
-(Reading database ... 12449 files and directories currently installed.)
+(Reading database ... 12447 files and directories currently installed.)
 Preparing to replace libattr1 2.4.31-1 (using .../libattr1_2.4.32-1_amd64.deb) ...
 Unpacking replacement libattr1 ...
 Preparing to replace libacl1 2.2.35-1 (using .../libacl1_2.2.36-1_amd64.deb) ...
@@ -123,12 +117,26 @@ Setting up libattr1 (2.4.32-1) ...
 
 Setting up libacl1 (2.2.36-1) ...
 
-(Reading database ... 12449 files and directories currently installed.)
+Selecting previously deselected package gcc-4.1-base.
+(Reading database ... 12447 files and directories currently installed.)
+Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1.0-1_amd64.deb) ...
+Preparing to replace libgcc1 1:4.0.3-1 (using .../libgcc1_1%3a4.1.0-1_amd64.deb) ...
+Unpacking replacement libgcc1 ...
+Setting up gcc-4.1-base (4.1.0-1) ...
+
+Setting up libgcc1 (4.1.0-1) ...
+
+(Reading database ... 12455 files and directories currently installed.)
+Preparing to replace libstdc++6 4.0.3-1 (using .../libstdc++6_4.1.0-1_amd64.deb) ...
+Unpacking replacement libstdc++6 ...
+Setting up libstdc++6 (4.1.0-1) ...
+
+(Reading database ... 12455 files and directories currently installed.)
 Preparing to replace sysv-rc 2.86.ds1-13 (using .../sysv-rc_2.86.ds1-14_all.deb) ...
 Unpacking replacement sysv-rc ...
 Setting up sysv-rc (2.86.ds1-14) ...
 
-(Reading database ... 12449 files and directories currently installed.)
+(Reading database ... 12455 files and directories currently installed.)
 Preparing to replace dmidecode 2.8-1 (using .../dmidecode_2.8-2_amd64.deb) ...
 Unpacking replacement dmidecode ...
 Preparing to replace info 4.8-6 (using .../archives/info_4.8-8_amd64.deb) ...
@@ -139,22 +147,16 @@ Preparing to replace klogd 1.4.1-17 (using .../klogd_1.4.1-17.1_amd64.deb) ...
 Unpacking replacement klogd ...
 Preparing to replace libssl0.9.8 0.9.8a-7 (using .../libssl0.9.8_0.9.8a-8_amd64.deb) ...
 Unpacking replacement libssl0.9.8 ...
+Preparing to replace manpages 2.22-1 (using .../manpages_2.23-1_all.deb) ...
+Unpacking replacement manpages ...
 Preparing to replace nano 1.3.10-2 (using .../nano_1.3.11-1_amd64.deb) ...
 Unpacking replacement nano ...
-Preparing to replace netbase 4.24 (using .../archives/netbase_4.25_all.deb) ...
-Unpacking replacement netbase ...
-Preparing to replace dselect 1.13.16 (using .../dselect_1.13.17_amd64.deb) ...
-Unpacking replacement dselect ...
 Preparing to replace libdb4.3 4.3.29-4.1 (using .../libdb4.3_4.3.29-5_amd64.deb) ...
 Unpacking replacement libdb4.3 ...
 Preparing to replace passwd 1:4.0.14-9 (using .../passwd_1%3a4.0.15-1_amd64.deb) ...
 Unpacking replacement passwd ...
 Preparing to replace cpp 4:4.0.2-2 (using .../cpp_4%3a4.0.3-1_amd64.deb) ...
 Unpacking replacement cpp ...
-Preparing to replace make 3.80+3.81.rc1-1 (using .../make_3.80+3.81.rc2-1_amd64.deb) ...
-Unpacking replacement make ...
-Preparing to replace dpkg-dev 1.13.16 (using .../dpkg-dev_1.13.17_all.deb) ...
-Unpacking replacement dpkg-dev ...
 Preparing to replace libdb4.2 4.2.52-23.1 (using .../libdb4.2_4.2.52-24_amd64.deb) ...
 Unpacking replacement libdb4.2 ...
 Preparing to replace exim4-config 4.60-4 (using .../exim4-config_4.60-5_all.deb) ...
@@ -178,8 +180,6 @@ Preparing to replace dhcp3-client 3.0.3-6 (using .../dhcp3-client_3.0.3-7_amd64.
 Unpacking replacement dhcp3-client ...
 Preparing to replace dhcp3-common 3.0.3-6 (using .../dhcp3-common_3.0.3-7_amd64.deb) ...
 Unpacking replacement dhcp3-common ...
-Preparing to replace libdb3 3.2.9-23 (using .../libdb3_3.2.9-25_amd64.deb) ...
-Unpacking replacement libdb3 ...
 Preparing to replace base-config 2.53.10-0.0.0.1.pure64 (using .../base-config_2.76_all.deb) ...
 Unpacking replacement base-config ...
 Setting up libc6-dev (2.3.6-4) ...
@@ -191,19 +191,14 @@ Setting up info (4.8-8) ...
 
 Setting up libssl0.9.8 (0.9.8a-8) ...
 
+Setting up manpages (2.23-1) ...
 Setting up nano (1.3.11-1) ...
 
-Setting up netbase (4.25) ...
-Installing new version of config file /etc/services ...
-
-Setting up dselect (1.13.17) ...
 Setting up libdb4.3 (4.3.29-5) ...
 Setting up passwd (4.0.15-1) ...
 
 Setting up cpp (4.0.3-1) ...
 
-Setting up make (3.80+3.81.rc2-1) ...
-Setting up dpkg-dev (1.13.17) ...
 Setting up libdb4.2 (4.2.52-24) ...
 Setting up exim4-config (4.60-5) ...
 Installing new version of config file /etc/exim4/conf.d/acl/20_exim4-config_whitelist_local_deny ...
@@ -226,8 +221,6 @@ NONE
 Setting up dhcp3-common (3.0.3-7) ...
 Setting up dhcp3-client (3.0.3-7) ...
 
-Setting up libdb3 (3.2.9-25) ...
-
 Setting up base-config (2.76) ...
 
 Setting up sysklogd (1.4.1-17.1) ...
@@ -249,9 +242,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//13051/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//13617/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.tQtcio/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//13051 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//13617 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log b/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log
index 65d64a5..37d4662 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.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//8913/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//8087/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 [3724kB]
+Get:1 http://ftp.jp.debian.org etch/main Packages [3730kB]
 Get:2 http://ftp.jp.debian.org etch/main Release [96B]
-Fetched 3724kB in 2s (1684kB/s)
+Fetched 3730kB in 2s (1851kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -40,7 +40,7 @@ The following packages will be upgraded:
   netbase netkit-inetd passwd patch perl perl-base perl-modules procps psmisc
   sed sysv-rc sysvinit tar tasksel tcpd telnet util-linux wget whiptail zlib1g
 116 upgraded, 18 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/64.3MB of archives.
+Need to get 0B/64.2MB of archives.
 After unpacking 39.6MB 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.1_amd64.deb) ...
@@ -74,8 +74,8 @@ Unpacking replacement libc6 ...
 Setting up libc6 (2.3.6-3) ...
 Checking for services that may need to be restarted...done.
 Current default timezone: 'UTC'.
-Local time is now:      Sat Apr  1 03:35:43 UTC 2006.
-Universal Time is now:  Sat Apr  1 03:35:43 UTC 2006.
+Local time is now:      Mon Apr  3 03:57:43 UTC 2006.
+Universal Time is now:  Mon Apr  3 03:57:43 UTC 2006.
 Run 'tzconfig' if you wish to change it.
 
 (Reading database ... 11045 files and directories currently installed.)
@@ -123,9 +123,9 @@ Unpacking replacement coreutils ...
 Setting up coreutils (5.2.1-2.1) ...
 
 (Reading database ... 11061 files and directories currently installed.)
-Preparing to replace dpkg 1.10.28 (using .../dpkg_1.13.16_amd64.deb) ...
+Preparing to replace dpkg 1.10.28 (using .../dpkg_1.13.17_amd64.deb) ...
 Unpacking replacement dpkg ...
-Setting up dpkg (1.13.16) ...
+Setting up dpkg (1.13.17) ...
 
 Configuration file `/etc/dpkg/dpkg.cfg'
  ==> File on system created by you or by a script.
@@ -136,61 +136,61 @@ Installing new version of config file /etc/dpkg/origins/debian ...
 Adding `local diversion of /usr/bin/md5sum.textutils to /usr/bin/md5sum'
 Adding `local diversion of /usr/share/man/man1/md5sum.textutils.1.gz to /usr/share/man/man1/md5sum.1.gz'
 
-(Reading database ... 11037 files and directories currently installed.)
+(Reading database ... 11040 files and directories currently installed.)
 Preparing to replace e2fslibs 1.37-2sarge1 (using .../e2fslibs_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement e2fslibs ...
 Setting up e2fslibs (1.38+1.39-WIP-2005.12.31-1) ...
 
-(Reading database ... 11037 files and directories currently installed.)
+(Reading database ... 11040 files and directories currently installed.)
 Preparing to replace e2fsprogs 1.37-2sarge1 (using .../e2fsprogs_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement e2fsprogs ...
 Replacing files in old package libuuid1 ...
 Replacing files in old package libblkid1 ...
 Setting up e2fsprogs (1.38+1.39-WIP-2005.12.31-1) ...
-(Reading database ... 11041 files and directories currently installed.)
+(Reading database ... 11044 files and directories currently installed.)
 Preparing to replace findutils 4.1.20-6 (using .../findutils_4.2.27-1_amd64.deb) ...
 Unpacking replacement findutils ...
 Setting up findutils (4.2.27-1) ...
 Installing new version of config file /etc/updatedb.conf ...
 
-(Reading database ... 11062 files and directories currently installed.)
+(Reading database ... 11065 files and directories currently installed.)
 Preparing to replace grep 2.5.1.ds1-4 (using .../grep_2.5.1.ds2-4_amd64.deb) ...
 Unpacking replacement grep ...
 Setting up grep (2.5.1.ds2-4) ...
 
-(Reading database ... 11061 files and directories currently installed.)
+(Reading database ... 11064 files and directories currently installed.)
 Preparing to replace gzip 1.3.5-10 (using .../gzip_1.3.5-12_amd64.deb) ...
 Unpacking replacement gzip ...
 Setting up gzip (1.3.5-12) ...
 
-(Reading database ... 11061 files and directories currently installed.)
+(Reading database ... 11064 files and directories currently installed.)
 Preparing to replace hostname 2.13 (using .../hostname_2.92_amd64.deb) ...
 Unpacking replacement hostname ...
 Setting up hostname (2.92) ...
 Selecting previously deselected package libdb4.3.
-(Reading database ... 11061 files and directories currently installed.)
+(Reading database ... 11064 files and directories currently installed.)
 Unpacking libdb4.3 (from .../libdb4.3_4.3.29-4.1_amd64.deb) ...
 Selecting previously deselected package libsepol1.
 Unpacking libsepol1 (from .../libsepol1_1.10-2_amd64.deb) ...
 Setting up libsepol1 (1.10-2) ...
 
 Selecting previously deselected package libselinux1.
-(Reading database ... 11070 files and directories currently installed.)
+(Reading database ... 11073 files and directories currently installed.)
 Unpacking libselinux1 (from .../libselinux1_1.28-4_amd64.deb) ...
 Setting up libselinux1 (1.28-4) ...
 
-(Reading database ... 11075 files and directories currently installed.)
+(Reading database ... 11078 files and directories currently installed.)
 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.1) ...
 Installing new version of config file /etc/pam.conf ...
 
-(Reading database ... 11075 files and directories currently installed.)
+(Reading database ... 11078 files and directories currently installed.)
 Preparing to replace libpam0g 0.76-22 (using .../libpam0g_0.79-3.1_amd64.deb) ...
 Unpacking replacement libpam0g ...
 Setting up libpam0g (0.79-3.1) ...
 
-(Reading database ... 11075 files and directories currently installed.)
+(Reading database ... 11078 files and directories currently installed.)
 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.1) ...
@@ -199,7 +199,7 @@ 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 ...
 
-(Reading database ... 11079 files and directories currently installed.)
+(Reading database ... 11082 files and directories currently installed.)
 Preparing to replace login 1:4.0.3-31sarge5 (using .../login_1%3a4.0.14-9_amd64.deb) ...
 Unpacking replacement login ...
 Setting up login (4.0.14-9) ...
@@ -207,16 +207,16 @@ Installing new version of config file /etc/pam.d/login ...
 Installing new version of config file /etc/pam.d/su ...
 Installing new version of config file /etc/login.defs ...
 
-(Reading database ... 11125 files and directories currently installed.)
+(Reading database ... 11128 files and directories currently installed.)
 Preparing to replace mount 2.12p-4 (using .../mount_2.12r-8_amd64.deb) ...
 Unpacking replacement mount ...
 Setting up mount (2.12r-8) ...
 
-(Reading database ... 11125 files and directories currently installed.)
+(Reading database ... 11128 files and directories currently installed.)
 Preparing to replace ncurses-bin 5.4-4 (using .../ncurses-bin_5.5-1_amd64.deb) ...
 Unpacking replacement ncurses-bin ...
 Setting up ncurses-bin (5.5-1) ...
-(Reading database ... 11125 files and directories currently installed.)
+(Reading database ... 11128 files and directories currently installed.)
 Preparing to replace perl-modules 5.8.4-8 (using .../perl-modules_5.8.8-3_all.deb) ...
 Unpacking replacement perl-modules ...
 Selecting previously deselected package libdb4.4.
@@ -224,46 +224,46 @@ Unpacking libdb4.4 (from .../libdb4.4_4.4.20-3_amd64.deb) ...
 Preparing to replace perl-base 5.8.4-8 (using .../perl-base_5.8.8-3_amd64.deb) ...
 Unpacking replacement perl-base ...
 Setting up perl-base (5.8.8-3) ...
-(Reading database ... 11284 files and directories currently installed.)
+(Reading database ... 11287 files and directories currently installed.)
 Preparing to replace perl 5.8.4-8 (using .../perl_5.8.8-3_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 ... 11645 files and directories currently installed.)
+(Reading database ... 11648 files and directories currently installed.)
 Preparing to replace sysv-rc 2.86.ds1-1 (using .../sysv-rc_2.86.ds1-13_all.deb) ...
 Unpacking replacement sysv-rc ...
 Setting up sysv-rc (2.86.ds1-13) ...
 
-(Reading database ... 11655 files and directories currently installed.)
+(Reading database ... 11658 files and directories currently installed.)
 Preparing to replace sysvinit 2.86.ds1-1 (using .../sysvinit_2.86.ds1-13_amd64.deb) ...
 Unpacking replacement sysvinit ...
 Setting up sysvinit (2.86.ds1-13) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 11657 files and directories currently installed.)
+(Reading database ... 11660 files and directories currently installed.)
 Preparing to replace tar 1.14-2 (using .../tar_1.15.1-6_amd64.deb) ...
 Unpacking replacement tar ...
 Setting up tar (1.15.1-6) ...
 
 Selecting previously deselected package lsb-base.
-(Reading database ... 11661 files and directories currently installed.)
+(Reading database ... 11664 files and directories currently installed.)
 Unpacking lsb-base (from .../lsb-base_3.0-16_all.deb) ...
 Setting up lsb-base (3.0-16) ...
 Selecting previously deselected package libslang2.
-(Reading database ... 11668 files and directories currently installed.)
+(Reading database ... 11671 files and directories currently installed.)
 Unpacking libslang2 (from .../libslang2_2.0.5-3_amd64.deb) ...
 Setting up libslang2 (2.0.5-3) ...
 
-(Reading database ... 11680 files and directories currently installed.)
+(Reading database ... 11683 files and directories currently installed.)
 Preparing to replace util-linux 2.12p-4 (using .../util-linux_2.12r-8_amd64.deb) ...
 Unpacking replacement util-linux ...
 Setting up util-linux (2.12r-8) ...
 Installing new version of config file /etc/init.d/hwclock.sh ...
 Installing new version of config file /etc/init.d/hwclockfirst.sh ...
 
-(Reading database ... 11680 files and directories currently installed.)
+(Reading database ... 11683 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 ...
@@ -301,7 +301,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 ... 11684 files and directories currently installed.)
+(Reading database ... 11687 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) ...
@@ -327,7 +327,7 @@ Setting up libtext-wrapi18n-perl (0.06-4) ...
 Setting up debconf-i18n (1.4.72) ...
 Setting up debconf (1.4.72) ...
 
-(Reading database ... 11714 files and directories currently installed.)
+(Reading database ... 11717 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.
@@ -339,11 +339,11 @@ Setting up gcc-4.0-base (4.0.3-1) ...
 Setting up libgcc1 (4.0.3-1) ...
 
 Selecting previously deselected package libstdc++6.
-(Reading database ... 11727 files and directories currently installed.)
+(Reading database ... 11730 files and directories currently installed.)
 Unpacking libstdc++6 (from .../libstdc++6_4.0.3-1_amd64.deb) ...
 Setting up libstdc++6 (4.0.3-1) ...
 
-(Reading database ... 11730 files and directories currently installed.)
+(Reading database ... 11733 files and directories currently installed.)
 Preparing to replace apt-utils 0.5.28.6 (using .../apt-utils_0.6.43.3_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Selecting previously deselected package libncursesw5.
@@ -356,12 +356,12 @@ Preparing to replace apt 0.5.28.6 (using .../apt_0.6.43.3_amd64.deb) ...
 Unpacking replacement apt ...
 Setting up apt (0.6.43.3) ...
 
-(Reading database ... 11761 files and directories currently installed.)
-Preparing to replace dselect 1.10.28 (using .../dselect_1.13.16_amd64.deb) ...
+(Reading database ... 11764 files and directories currently installed.)
+Preparing to replace dselect 1.10.28 (using .../dselect_1.13.17_amd64.deb) ...
 Unpacking replacement dselect ...
-Setting up dselect (1.13.16) ...
+Setting up dselect (1.13.17) ...
 Installing new version of config file /etc/dpkg/dselect.cfg ...
-(Reading database ... 11786 files and directories currently installed.)
+(Reading database ... 11789 files and directories currently installed.)
 Preparing to replace initscripts 2.86.ds1-1 (using .../initscripts_2.86.ds1-13_amd64.deb) ...
 Unmodified conffile '/etc/init.d/bootclean.sh' obsolete; removed `/etc/init.d/bootclean.sh'
 Unpacking replacement initscripts ...
@@ -384,7 +384,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 ... 11801 files and directories currently installed.)
+(Reading database ... 11804 files and directories currently installed.)
 Preparing to replace libattr1 2.4.16-1 (using .../libattr1_2.4.31-1_amd64.deb) ...
 Unpacking replacement libattr1 ...
 Preparing to replace libacl1 2.2.23-1 (using .../libacl1_2.2.35-1_amd64.deb) ...
@@ -393,27 +393,27 @@ Setting up libattr1 (2.4.31-1) ...
 
 Setting up libacl1 (2.2.35-1) ...
 
-(Reading database ... 11801 files and directories currently installed.)
+(Reading database ... 11804 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 ... 11801 files and directories currently installed.)
+(Reading database ... 11804 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 ... 11801 files and directories currently installed.)
+(Reading database ... 11804 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 ... 11801 files and directories currently installed.)
+(Reading database ... 11804 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 ... 11801 files and directories currently installed.)
+(Reading database ... 11804 files and directories currently installed.)
 Preparing to replace libgpg-error0 1.0-1 (using .../libgpg-error0_1.2-1_amd64.deb) ...
 Unpacking replacement libgpg-error0 ...
 Preparing to replace libgcrypt11 1.2.0-11.1 (using .../libgcrypt11_1.2.2-1_amd64.deb) ...
@@ -422,7 +422,7 @@ Preparing to replace zlib1g 1:1.2.2-4 (using .../zlib1g_1%3a1.2.3-11_amd64.deb)
 Unpacking replacement zlib1g ...
 Setting up zlib1g (1.2.3-11) ...
 
-(Reading database ... 11804 files and directories currently installed.)
+(Reading database ... 11807 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) ...
@@ -451,7 +451,7 @@ Preparing to replace tcpd 7.6.dbs-8 (using .../tcpd_7.6.dbs-9_amd64.deb) ...
 Unpacking replacement tcpd ...
 Preparing to replace iputils-ping 3:20020927-2 (using .../iputils-ping_3%3a20020927-3_amd64.deb) ...
 Unpacking replacement iputils-ping ...
-Preparing to replace netbase 4.21 (using .../archives/netbase_4.24_all.deb) ...
+Preparing to replace netbase 4.21 (using .../archives/netbase_4.25_all.deb) ...
 Unpacking replacement netbase ...
 Preparing to replace exim4-base 4.50-8 (using .../exim4-base_4.60-4_amd64.deb) ...
 Unpacking replacement exim4-base ...
@@ -461,7 +461,7 @@ Setting up passwd (4.0.14-9) ...
 Installing new version of config file /etc/pam.d/chfn ...
 Installing new version of config file /etc/pam.d/chsh ...
 
-(Reading database ... 11938 files and directories currently installed.)
+(Reading database ... 11942 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-13_amd64.deb) ...
@@ -479,7 +479,7 @@ Unpacking replacement libstdc++5 ...
 Setting up gcc-3.3-base (3.3.6-13) ...
 Setting up libstdc++5 (3.3.6-13) ...
 
-(Reading database ... 11960 files and directories currently installed.)
+(Reading database ... 11964 files and directories currently installed.)
 Preparing to replace bsdmainutils 6.0.17 (using .../bsdmainutils_6.1.3_amd64.deb) ...
 Unpacking replacement bsdmainutils ...
 Preparing to replace cpio 2.5-1.2 (using .../archives/cpio_2.6-11_amd64.deb) ...
@@ -535,9 +535,9 @@ Preparing to replace cpp 4:3.3.5-3 (using .../cpp_4%3a4.0.2-2_amd64.deb) ...
 Unpacking replacement cpp ...
 Preparing to replace patch 2.5.9-2 (using .../patch_2.5.9-4_amd64.deb) ...
 Unpacking replacement patch ...
-Preparing to replace make 3.80-9 (using .../make_3.80+3.81.rc1-1_amd64.deb) ...
+Preparing to replace make 3.80-9 (using .../make_3.80+3.81.rc2-1_amd64.deb) ...
 Unpacking replacement make ...
-Preparing to replace dpkg-dev 1.10.28 (using .../dpkg-dev_1.13.16_all.deb) ...
+Preparing to replace dpkg-dev 1.10.28 (using .../dpkg-dev_1.13.17_all.deb) ...
 Unpacking replacement dpkg-dev ...
 Preparing to replace exim4 4.50-8 (using .../archives/exim4_4.60-4_all.deb) ...
 Unpacking replacement exim4 ...
@@ -560,7 +560,7 @@ Preparing to replace dhcp3-client 3.0.1-2 (using .../dhcp3-client_3.0.3-6_amd64.
 Unpacking replacement dhcp3-client ...
 Preparing to replace dhcp3-common 3.0.1-2 (using .../dhcp3-common_3.0.3-6_amd64.deb) ...
 Unpacking replacement dhcp3-common ...
-Preparing to replace libdb3 3.2.9-22 (using .../libdb3_3.2.9-23_amd64.deb) ...
+Preparing to replace libdb3 3.2.9-22 (using .../libdb3_3.2.9-25_amd64.deb) ...
 Unpacking replacement libdb3 ...
 Preparing to replace psmisc 21.5-1 (using .../psmisc_22.2-1_amd64.deb) ...
 Unpacking replacement psmisc ...
@@ -634,7 +634,7 @@ Setting up libwrap0 (7.6.dbs-9) ...
 Setting up tcpd (7.6.dbs-9) ...
 
 Setting up iputils-ping (20020927-3) ...
-Setting up netbase (4.24) ...
+Setting up netbase (4.25) ...
 Installing new version of config file /etc/protocols ...
 Installing new version of config file /etc/init.d/networking ...
 Installing new version of config file /etc/services ...
@@ -708,8 +708,7 @@ Setting up cpp-4.0 (4.0.3-1) ...
 Setting up cpp (4.0.2-2) ...
 
 Setting up patch (2.5.9-4) ...
-Setting up make (3.80+3.81.rc1-1) ...
-
+Setting up make (3.80+3.81.rc2-1) ...
 Setting up exim4 (4.60-4) ...
 Setting up gcc-4.0 (4.0.3-1) ...
 Setting up gcc (4.0.2-2) ...
@@ -721,7 +720,7 @@ Setting up dhcp3-client (3.0.3-6) ...
 Installing new version of config file /etc/dhcp3/dhclient-exit-hooks.d/debug ...
 Installing new version of config file /etc/dhcp3/dhclient-script ...
 
-Setting up libdb3 (3.2.9-23) ...
+Setting up libdb3 (3.2.9-25) ...
 
 Setting up psmisc (22.2-1) ...
 
@@ -747,9 +746,9 @@ Installing new version of config file /etc/init.d/console-screen.sh ...
 Setting up g++-3.3 (3.3.6-13) ...
 Setting up perl (5.8.8-3) ...
 
-Setting up dpkg-dev (1.13.16) ...
-Installing new version of config file /etc/dpkg/shlibs.default ...
+Setting up dpkg-dev (1.13.17) ...
 Installing new version of config file /etc/dpkg/shlibs.override ...
+Installing new version of config file /etc/dpkg/shlibs.default ...
 Setting up build-essential (11.2) ...
 Reading package lists...
 Building dependency tree...
@@ -764,9 +763,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//8913/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//8087/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.tQtcio/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//8913 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//8087 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-etch.log b/testsuite/cdebootstrap/pdebuild-internal-etch.log
index f6bf631..8117282 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.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/2245/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/16807/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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 ... 11041 files and directories currently installed.)
+(Reading database ... 11040 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.11_amd64.deb) ...
 Selecting previously deselected package pbuilder.
-Unpacking pbuilder (from .../pbuilder_0.149_all.deb) ...
+Unpacking pbuilder (from .../pbuilder_0.150_all.deb) ...
 Setting up libdebian-installer4 (0.38) ...
 Setting up libdebian-installer-extra4 (0.38) ...
 Setting up cdebootstrap (0.3.11) ...
-Setting up pbuilder (0.149) ...
+Setting up pbuilder (0.150) ...
 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 html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package gettext-base.
-(Reading database ... 11138 files and directories currently installed.)
+(Reading database ... 11137 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.17-1_amd64.deb) ...
@@ -110,7 +110,7 @@ After unpacking 401kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 11792 files and directories currently installed.)
+(Reading database ... 11791 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
 Setting up fakeroot (1.5.8) ...
 
@@ -123,14 +123,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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -319,18 +319,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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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; \
@@ -343,26 +343,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.tQtcio/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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
@@ -374,7 +374,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
@@ -409,11 +408,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 Apr  1 03:44:53 UTC 2006
+Mon Apr  3 04:06:14 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
@@ -483,7 +482,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 Apr  1 03:44:58 UTC 2006
+Mon Apr  3 04:06:19 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -499,9 +498,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -511,58 +510,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.tQtcio/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/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.tQtcio/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.c0ynuA/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.tQtcio/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.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/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.tQtcio/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/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.tQtcio/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.tQtcio/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.tQtcio/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.tQtcio/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/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.c0ynuA/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.c0ynuA/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.c0ynuA/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.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -601,6 +600,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.tQtcio/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/2245 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/16807 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-sarge.log b/testsuite/cdebootstrap/pdebuild-internal-sarge.log
index 53dc3b6..225e742 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.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/1612/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/819/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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
@@ -360,6 +360,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
@@ -398,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 Apr  1 03:34:34 UTC 2006
+Mon Apr  3 03:56:38 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
@@ -411,17 +412,32 @@ 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
 1: Setting forklimit to 3 and wait_shell to 0
 1: ... Waiting for process to end with waitpid
+1: DUMPing parameters passed to llexec
+1: [1] 
 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
+... Waiting for process to end with waitpid
 DUMPing parameters passed to llexec
-[3] 
+[1] 
 4: Using sleep as the remote shell
 4: Show machine names on output
 4: Adding machine 5,4,3,2,1 to list
@@ -453,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 Apr  1 03:34:39 UTC 2006
+Mon Apr  3 03:56:43 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).
+a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -469,9 +485,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -479,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.tQtcio/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/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.tQtcio/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.c0ynuA/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.tQtcio/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.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/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.tQtcio/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/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.tQtcio/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.tQtcio/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.tQtcio/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.tQtcio/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/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.c0ynuA/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.c0ynuA/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.c0ynuA/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.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -554,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.tQtcio/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/1612 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/819 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-sid.log b/testsuite/cdebootstrap/pdebuild-internal-sid.log
index b33f737..1358756 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.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/10421/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/26739/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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,20 +26,20 @@ After unpacking 766kB 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 ... 11080 files and directories currently installed.)
+(Reading database ... 11096 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.41_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.41_amd64.deb) ...
 Selecting previously deselected package cdebootstrap.
 Unpacking cdebootstrap (from .../cdebootstrap_0.3.11_amd64.deb) ...
 Selecting previously deselected package pbuilder.
-Unpacking pbuilder (from .../pbuilder_0.150_all.deb) ...
+Unpacking pbuilder (from .../pbuilder_0.151_all.deb) ...
 Setting up libdebian-installer4 (0.41) ...
 Setting up libdebian-installer-extra4 (0.41) ...
 Setting up cdebootstrap (0.3.11) ...
-Setting up pbuilder (0.150) ...
+Setting up pbuilder (0.151) ...
 Setting DEBBUILDOPTS=
- -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.23 2006/02/11 13:17:04 dancer Exp $
+ -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.24 2006/03/31 00:14:31 dancer Exp $
  -> Considering  debhelper (>> 3.0.0)
    -> Trying debhelper
  -> Considering  libdshconfig1-dev (>= 0.20.11-1)
@@ -64,7 +64,7 @@ WARNING: The following packages cannot be authenticated!
   gettext-base libmagic1 file html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package gettext-base.
-(Reading database ... 11177 files and directories currently installed.)
+(Reading database ... 11193 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.17-1_amd64.deb) ...
@@ -110,7 +110,7 @@ After unpacking 401kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 11831 files and directories currently installed.)
+(Reading database ... 11847 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
 Setting up fakeroot (1.5.8) ...
 
@@ -123,14 +123,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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -319,18 +319,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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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; \
@@ -343,26 +343,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.tQtcio/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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
@@ -413,7 +413,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 Apr  1 03:28:34 UTC 2006
+Mon Apr  3 03:50:58 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
@@ -483,13 +483,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 Apr  1 03:28:39 UTC 2006
+Mon Apr  3 03:51:03 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-c: c
+dsh: Process terminated (before write).
 b: b
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -498,9 +499,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -510,58 +511,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.tQtcio/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/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.tQtcio/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.c0ynuA/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.tQtcio/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.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/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.tQtcio/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/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.tQtcio/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.tQtcio/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.tQtcio/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.tQtcio/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/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.c0ynuA/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.c0ynuA/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.c0ynuA/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.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -600,6 +601,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.tQtcio/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/10421 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/26739 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-etch.log b/testsuite/cdebootstrap/pdebuild-normal-etch.log
index c2e1499..5b7abaf 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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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 Apr  1 12:42:35 JST 2006
-pbuilder-time-stamp: 1143862955
+Current time: Mon Apr  3 13:04:20 JST 2006
+pbuilder-time-stamp: 1144037060
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/27920/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/9940/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 html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package gettext-base.
-(Reading database ... 11041 files and directories currently installed.)
+(Reading database ... 11040 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.17-1_amd64.deb) ...
@@ -115,13 +115,13 @@ After unpacking 401kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 11695 files and directories currently installed.)
+(Reading database ... 11694 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
 Setting up fakeroot (1.5.8) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/27920/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/27920/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/9940/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/9940/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -412,7 +412,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
@@ -447,11 +446,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 Apr  1 03:43:42 UTC 2006
+Mon Apr  3 04:05: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
@@ -521,13 +520,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 Apr  1 03:43:47 UTC 2006
+Mon Apr  3 04:05:16 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
-Process terminated (before write).
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -651,7 +650,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 Apr  1 12:43:50 JST 2006
-pbuilder-time-stamp: 1143863030
+Current time: Mon Apr  3 13:05:19 JST 2006
+pbuilder-time-stamp: 1144037119
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/27920 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/9940 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-sarge.log b/testsuite/cdebootstrap/pdebuild-normal-sarge.log
index 09d3048..962c187 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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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 Apr  1 12:32:32 JST 2006
-pbuilder-time-stamp: 1143862352
+Current time: Mon Apr  3 12:55:03 JST 2006
+pbuilder-time-stamp: 1144036503
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/27296/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/26489/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.tQtcio/dir3/27296/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/27296/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/26489/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/26489/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -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 Apr  1 03:33:22 UTC 2006
+Mon Apr  3 03:55:48 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 +511,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 Apr  1 03:33:27 UTC 2006
+Mon Apr  3 03:55:53 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).
-b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -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 Apr  1 12:33:29 JST 2006
-pbuilder-time-stamp: 1143862409
+Current time: Mon Apr  3 12:55:55 JST 2006
+pbuilder-time-stamp: 1144036555
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/27296 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/26489 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-sid.log b/testsuite/cdebootstrap/pdebuild-normal-sid.log
index 2adfe31..1278146 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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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 Apr  1 12:26:14 JST 2006
-pbuilder-time-stamp: 1143861974
+Current time: Mon Apr  3 12:48:36 JST 2006
+pbuilder-time-stamp: 1144036116
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/3524/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/19562/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 html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package gettext-base.
-(Reading database ... 11080 files and directories currently installed.)
+(Reading database ... 11096 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.17-1_amd64.deb) ...
@@ -115,13 +115,13 @@ After unpacking 401kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 11734 files and directories currently installed.)
+(Reading database ... 11750 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
 Setting up fakeroot (1.5.8) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/3524/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/3524/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/19562/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/19562/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -412,7 +412,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
@@ -451,7 +450,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 Apr  1 03:27:19 UTC 2006
+Mon Apr  3 03:49:41 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
@@ -521,7 +520,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 Apr  1 03:27:24 UTC 2006
+Mon Apr  3 03:49:46 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -651,7 +650,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 Apr  1 12:27:26 JST 2006
-pbuilder-time-stamp: 1143862046
+Current time: Mon Apr  3 12:49:49 JST 2006
+pbuilder-time-stamp: 1144036189
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/3524 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/19562 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-etch.log b/testsuite/normal/pbuilder-build-dsh-etch.log
index 5d199db..e24d937 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 Apr  1 12:17:18 JST 2006
-pbuilder-time-stamp: 1143861438
+Current time: Mon Apr  3 12:35:05 JST 2006
+pbuilder-time-stamp: 1144035305
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/32747/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/2282/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -36,7 +36,7 @@ The following NEW packages will be installed:
 Need to get 0B/2910kB of archives.
 After unpacking 9699kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11214 files and directories currently installed.)
+(Reading database ... 11215 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-1_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-1_amd64.deb) ...
@@ -76,17 +76,17 @@ The following NEW packages will be installed:
 Need to get 0B/96.2kB of archives.
 After unpacking 401kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11808 files and directories currently installed.)
+(Reading database ... 11809 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
 Setting up fakeroot (1.5.8) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/32747/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/32747/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/2282/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/2282/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -407,11 +407,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 Apr  1 03:18:16 UTC 2006
+Mon Apr  3 03:35:48 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
@@ -481,14 +481,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 Apr  1 03:18:21 UTC 2006
+Mon Apr  3 03:35:53 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
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -611,7 +611,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 Apr  1 12:18:23 JST 2006
-pbuilder-time-stamp: 1143861503
+Current time: Mon Apr  3 12:35:55 JST 2006
+pbuilder-time-stamp: 1144035355
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/32747 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/2282 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-sarge.log b/testsuite/normal/pbuilder-build-dsh-sarge.log
index e5e5f6f..5e15f51 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 Apr  1 12:08:34 JST 2006
-pbuilder-time-stamp: 1143860914
+Current time: Mon Apr  3 12:22:11 JST 2006
+pbuilder-time-stamp: 1144034531
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/29145/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/28331/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.tQtcio/dir1/29145/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/29145/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/28331/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/28331/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -395,9 +395,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
@@ -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 Apr  1 03:09:16 UTC 2006
+Mon Apr  3 03:22:46 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 Apr  1 03:09:21 UTC 2006
+Mon Apr  3 03:22:51 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
@@ -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 Apr  1 12:09:23 JST 2006
-pbuilder-time-stamp: 1143860963
+Current time: Mon Apr  3 12:22:54 JST 2006
+pbuilder-time-stamp: 1144034574
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/29145 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/28331 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-sid.log b/testsuite/normal/pbuilder-build-dsh-sid.log
index 4e36751..63185d9 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 Apr  1 12:02:19 JST 2006
-pbuilder-time-stamp: 1143860539
+Current time: Mon Apr  3 12:02:24 JST 2006
+pbuilder-time-stamp: 1144033344
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/31639/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/28930/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
@@ -33,12 +33,10 @@ The following NEW packages will be installed:
   debhelper file gettext html2text intltool-debian libdshconfig1
   libdshconfig1-dev libmagic1 po-debconf
 0 upgraded, 9 newly installed, 0 to remove and 0 not upgraded.
-Need to get 508kB/2911kB of archives.
+Need to get 0B/2911kB of archives.
 After unpacking 9699kB of additional disk space will be used.
-Get:1 http://ftp.jp.debian.org sid/main debhelper 5.0.27 [508kB]
-Fetched 508kB in 2s (251kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11255 files and directories currently installed.)
+(Reading database ... 11271 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-1_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-1_amd64.deb) ...
@@ -78,18 +76,17 @@ The following NEW packages will be installed:
 Need to get 0B/96.2kB of archives.
 After unpacking 401kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11849 files and directories currently installed.)
+(Reading database ... 11865 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
 Setting up fakeroot (1.5.8) ...
 
 Copying back the cached apt archive contents
- -> new cache content debhelper_5.0.27_all.deb added
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/31639/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/31639/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/28930/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/28930/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 su: Authentication service cannot retrieve authentication info.
 (Ignored)
@@ -401,9 +398,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
@@ -411,11 +408,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 Apr  1 03:03:39 UTC 2006
+Mon Apr  3 03:03:25 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
@@ -485,14 +482,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 Apr  1 03:03:44 UTC 2006
+Mon Apr  3 03:03:30 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).
 a: a
+dsh: Process terminated (before write).
+c: c
+b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -615,7 +612,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 Apr  1 12:03:46 JST 2006
-pbuilder-time-stamp: 1143860626
+Current time: Mon Apr  3 12:03:32 JST 2006
+pbuilder-time-stamp: 1144033412
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir1/31639 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir1/28930 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-etch.log b/testsuite/normal/pbuilder-create-etch.log
index 4e473b9..959707a 100644
--- a/testsuite/normal/pbuilder-create-etch.log
+++ b/testsuite/normal/pbuilder-create-etch.log
@@ -7,7 +7,7 @@ I: Retrieving Packages
 I: Validating Packages
 I: Resolving dependencies of required packages...
 I: Resolving dependencies of base packages...
-I: Found additional base dependencies: libdb4.2 libgnutls12 libnewt0.51 libreadline5 libsigc++-2.0-0c2a readline-common 
+I: Found additional base dependencies: libdb4.2 libgnutls12 libnewt0.51 libreadline5 libsigc++-2.0-0c2a openbsd-inetd readline-common 
 I: Checking component main on http://ftp.jp.debian.org/debian-amd64/debian...
 I: Retrieving adduser
 I: Validating adduser
@@ -213,6 +213,8 @@ I: Retrieving netkit-inetd
 I: Validating netkit-inetd
 I: Retrieving nvi
 I: Validating nvi
+I: Retrieving openbsd-inetd
+I: Validating openbsd-inetd
 I: Retrieving passwd
 I: Validating passwd
 I: Retrieving perl-base
@@ -474,7 +476,8 @@ I: Unpacking netbase...
 I: Unpacking netcat...
 I: Unpacking netkit-inetd...
 I: Unpacking nvi...
-I: Unpacking readline-common...
+I: Unpacking openbsd-inetd...
+I: Unpacking netkit-inetd...
 I: Unpacking sysklogd...
 I: Unpacking tasksel...
 I: Unpacking tcpd...
@@ -515,7 +518,6 @@ I: Configuring libbz2-1.0...
 I: Configuring cron...
 I: Configuring libsasl2...
 I: Configuring nano...
-I: Configuring netkit-inetd...
 I: Configuring libconsole...
 I: Configuring apt-utils...
 I: Configuring iptables...
@@ -538,11 +540,12 @@ I: Configuring libopencdk8...
 I: Configuring libgnutls12...
 I: Configuring libgnutls11...
 I: Configuring libldap2...
-I: Configuring netbase...
 I: Configuring tasksel...
 I: Configuring gnupg...
-I: Configuring klogd...
 I: Configuring sysklogd...
+I: Configuring klogd...
+I: Configuring netbase...
+I: Configuring openbsd-inetd...
 I: Base system installed successfully.
  -> debootstrap finished
  -> copying local configuration
@@ -556,17 +559,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//24764/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//25069/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//24764/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//25069/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 (2069B/s)
+Fetched 189B in 1s (99B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -591,10 +594,10 @@ 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.1MB of archives.
-After unpacking 83.2MB of additional disk space will be used.
+Need to get 0B/20.9MB of archives.
+After unpacking 83.0MB of additional disk space will be used.
 Selecting previously deselected package binutils.
-(Reading database ... 6848 files and directories currently installed.)
+(Reading database ... 6851 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.3-1_amd64.deb) ...
@@ -609,9 +612,9 @@ Unpacking perl (from .../perl_5.8.8-3_amd64.deb) ...
 Selecting previously deselected package patch.
 Unpacking patch (from .../patch_2.5.9-4_amd64.deb) ...
 Selecting previously deselected package make.
-Unpacking make (from .../make_3.80+3.81.rc1-1_amd64.deb) ...
+Unpacking make (from .../make_3.80+3.81.rc2-1_amd64.deb) ...
 Selecting previously deselected package dpkg-dev.
-Unpacking dpkg-dev (from .../dpkg-dev_1.13.16_all.deb) ...
+Unpacking dpkg-dev (from .../dpkg-dev_1.13.17_all.deb) ...
 Selecting previously deselected package gcc-4.0.
 Unpacking gcc-4.0 (from .../gcc-4.0_4.0.3-1_amd64.deb) ...
 Selecting previously deselected package gcc.
@@ -635,8 +638,7 @@ Setting up cpp (4.0.2-2) ...
 
 Setting up libdb4.4 (4.4.20-3) ...
 Setting up patch (2.5.9-4) ...
-Setting up make (3.80+3.81.rc1-1) ...
-
+Setting up make (3.80+3.81.rc2-1) ...
 Setting up gcc-4.0 (4.0.3-1) ...
 Setting up gcc (4.0.2-2) ...
 
@@ -650,7 +652,7 @@ Setting up g++ (4.0.2-2) ...
 
 Setting up perl (5.8.8-3) ...
 
-Setting up dpkg-dev (1.13.16) ...
+Setting up dpkg-dev (1.13.17) ...
 Setting up build-essential (11.2) ...
 Copying back the cached apt archive contents
 umount: /sys: not mounted
@@ -659,9 +661,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//24764/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//25069/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.tQtcio/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//24764 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//25069 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-sarge.log b/testsuite/normal/pbuilder-create-sarge.log
index c2ae962..34f8773 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//20407/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//17610/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//20407/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//17610/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 (1923B/s)
+Fetched 110B in 0s (1933B/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//20407/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//17610/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.tQtcio/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//20407 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//17610 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-sid.log b/testsuite/normal/pbuilder-create-sid.log
index 50180dc..7bffb78 100644
--- a/testsuite/normal/pbuilder-create-sid.log
+++ b/testsuite/normal/pbuilder-create-sid.log
@@ -59,6 +59,8 @@ I: Retrieving findutils
 I: Validating findutils
 I: Retrieving gcc-4.0-base
 I: Validating gcc-4.0-base
+I: Retrieving gcc-4.1-base
+I: Validating gcc-4.1-base
 I: Retrieving gettext-base
 I: Validating gettext-base
 I: Retrieving gnupg
@@ -105,6 +107,8 @@ I: Retrieving libdb4.2
 I: Validating libdb4.2
 I: Retrieving libdb4.3
 I: Validating libdb4.3
+I: Retrieving libdevmapper1.02
+I: Validating libdevmapper1.02
 I: Retrieving libgcc1
 I: Validating libgcc1
 I: Retrieving libgcrypt11
@@ -262,6 +266,7 @@ I: Extracting e2fslibs...
 I: Extracting e2fsprogs...
 I: Extracting findutils...
 I: Extracting gcc-4.0-base...
+I: Extracting gcc-4.1-base...
 I: Extracting grep...
 I: Extracting gzip...
 I: Extracting hostname...
@@ -273,6 +278,7 @@ I: Extracting libc6...
 I: Extracting libcap1...
 I: Extracting libcomerr2...
 I: Extracting libdb4.3...
+I: Extracting libdevmapper1.02...
 I: Extracting libgcc1...
 I: Extracting liblocale-gettext-perl...
 I: Extracting libncurses5...
@@ -322,6 +328,7 @@ I: Unpacking e2fslibs...
 I: Unpacking e2fsprogs...
 I: Unpacking findutils...
 I: Unpacking gcc-4.0-base...
+I: Unpacking gcc-4.1-base...
 I: Unpacking grep...
 I: Unpacking gzip...
 I: Unpacking hostname...
@@ -333,6 +340,7 @@ I: Unpacking libc6...
 I: Unpacking libcap1...
 I: Unpacking libcomerr2...
 I: Unpacking libdb4.3...
+I: Unpacking libdevmapper1.02...
 I: Unpacking libgcc1...
 I: Unpacking liblocale-gettext-perl...
 I: Unpacking libncurses5...
@@ -368,6 +376,7 @@ I: Unpacking zlib1g...
 I: Configuring required packages...
 I: Configuring sysv-rc...
 I: Configuring gcc-4.0-base...
+I: Configuring gcc-4.1-base...
 I: Configuring libpam-runtime...
 I: Configuring libc6...
 I: Configuring libcap1...
@@ -400,6 +409,7 @@ I: Configuring liblocale-gettext-perl...
 I: Configuring diff...
 I: Configuring libselinux1...
 I: Configuring libstdc++6...
+I: Configuring libdevmapper1.02...
 I: Configuring libtext-charwidth-perl...
 I: Configuring libtext-wrapi18n-perl...
 I: Configuring coreutils...
@@ -560,17 +570,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//23624/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//19135/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//23624/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//19135/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 (2185B/s)
+Fetched 189B in 0s (1184B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -598,7 +608,7 @@ The following NEW packages will be installed:
 Need to get 0B/20.9MB of archives.
 After unpacking 83.0MB of additional disk space will be used.
 Selecting previously deselected package binutils.
-(Reading database ... 6891 files and directories currently installed.)
+(Reading database ... 6907 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.3-1_amd64.deb) ...
@@ -656,17 +666,21 @@ Setting up perl (5.8.8-3) ...
 Setting up dpkg-dev (1.13.17) ...
 Setting up build-essential (11.2) ...
 Copying back the cached apt archive contents
- -> new cache content dmidecode_2.8-2_amd64.deb added
- -> new cache content nano_1.3.11-1_amd64.deb added
+ -> new cache content gcc-4.1-base_4.1.0-1_amd64.deb added
+ -> new cache content libdevmapper1.02_2%3a1.02.03-1_amd64.deb added
+ -> new cache content libgcc1_1%3a4.1.0-1_amd64.deb added
+ -> new cache content libstdc++6_4.1.0-1_amd64.deb added
+ -> new cache content libusb-0.1-4_2%3a0.1.12-1_amd64.deb added
+ -> new cache content manpages_2.23-1_all.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//23624/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//19135/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.tQtcio/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//23624 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//19135 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-etch.log b/testsuite/normal/pbuilder-execute-etch.log
index 1db1855..5cd8cc2 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.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//20530/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//22594/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//20530 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//22594 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-sarge.log b/testsuite/normal/pbuilder-execute-sarge.log
index 927b054..b8885a9 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.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//16952/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//16168/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//16952 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//16168 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-sid.log b/testsuite/normal/pbuilder-execute-sid.log
index 5220e62..eab5a8d 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.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//19585/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//16772/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//19585 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//16772 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-etch-sid-experimental.log b/testsuite/normal/pbuilder-update-etch-sid-experimental.log
index 906c008..3984052 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.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//23040/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//25110/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -16,40 +16,29 @@ 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 [154kB]
-Fetched 158kB in 0s (668kB/s)
+Get:4 http://ftp.jp.debian.org experimental/main Packages [158kB]
+Fetched 163kB in 9s (18.0kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
 Reading package lists...
 Building dependency tree...
-The following NEW packages will be installed:
-  gcc-4.1-base
 The following packages have been kept back:
   apt apt-utils
 The following packages will be upgraded:
-  aptitude diff gettext-base libgcc1 libstdc++6
-5 upgraded, 1 newly installed, 0 to remove and 2 not upgraded.
-Need to get 0B/3468kB of archives.
-After unpacking 578kB of additional disk space will be used.
-(Reading database ... 11256 files and directories currently installed.)
+  aptitude diff gettext-base lsb-base
+4 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.
+Need to get 0B/2979kB of archives.
+After unpacking 315kB of additional disk space will be used.
+(Reading database ... 11265 files and directories currently installed.)
 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 ... 11264 files and directories currently installed.)
-Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1.0-0_amd64.deb) ...
-Preparing to replace libgcc1 1:4.0.3-1 (using .../libgcc1_1%3a4.1.0-0_amd64.deb) ...
-Unpacking replacement libgcc1 ...
-Setting up gcc-4.1-base (4.1.0-0) ...
-Setting up libgcc1 (4.1.0-0) ...
-
-(Reading database ... 11270 files and directories currently installed.)
-Preparing to replace libstdc++6 4.0.3-1 (using .../libstdc++6_4.1.0-0_amd64.deb) ...
-Unpacking replacement libstdc++6 ...
-Setting up libstdc++6 (4.1.0-0) ...
-
-(Reading database ... 11270 files and directories currently installed.)
+(Reading database ... 11273 files and directories currently installed.)
+Preparing to replace lsb-base 3.0-16 (using .../lsb-base_3.1-1_all.deb) ...
+Unpacking replacement lsb-base ...
+Setting up lsb-base (3.1-1) ...
+(Reading database ... 11273 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) ...
@@ -75,10 +64,10 @@ The following packages will be upgraded:
 2 upgraded, 0 newly installed, 2 to remove and 0 not upgraded.
 Need to get 0B/1535kB of archives.
 After unpacking 9683kB disk space will be freed.
-(Reading database ... 11270 files and directories currently installed.)
+(Reading database ... 11273 files and directories currently installed.)
 Removing tasksel ...
 Removing aptitude ...
-(Reading database ... 11065 files and directories currently installed.)
+(Reading database ... 11068 files and directories currently installed.)
 Preparing to replace apt-utils 0.6.43.3 (using .../apt-utils_0.6.43.3exp1_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Preparing to replace apt 0.6.43.3 (using .../apt_0.6.43.3exp1_amd64.deb) ...
@@ -94,9 +83,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//23040/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//25110/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.tQtcio/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//23040 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//25110 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-etch-sid.log b/testsuite/normal/pbuilder-update-etch-sid.log
index e885785..f3af8f8 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.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//21353/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//23433/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 [5902B]
-Get:3 http://ftp.jp.debian.org sid/main Packages [4015kB]
-Fetched 4021kB in 2s (1958kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [4028kB]
+Fetched 4034kB in 27s (148kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -22,39 +22,39 @@ Building dependency tree...
 The following packages will be REMOVED:
   libnewt0.51
 The following NEW packages will be installed:
-  libnewt0.52
+  gcc-4.1-base libnewt0.52
 The following packages will be upgraded:
-  bash coreutils cpp dmidecode dpkg dpkg-dev dselect g++ gcc info initscripts
-  klogd libacl1 libattr1 libc6 libc6-dev libdb4.2 libdb4.3 libdb4.4
-  libreadline5 libsasl2 libselinux1 libsepol1 libslang2 libssl0.9.8
-  libusb-0.1-4 login make nano netbase netcat passwd readline-common sysklogd
-  sysv-rc sysvinit whiptail
-37 upgraded, 1 newly installed, 1 to remove and 0 not upgraded.
-Need to get 0B/19.6MB of archives.
-After unpacking 1544kB of additional disk space will be used.
-(Reading database ... 11214 files and directories currently installed.)
+  bash coreutils cpp dmidecode g++ gcc info initscripts klogd libacl1 libattr1
+  libc6 libc6-dev libdb4.2 libdb4.3 libdb4.4 libgcc1 libreadline5 libsasl2
+  libselinux1 libsepol1 libslang2 libssl0.9.8 libstdc++6 libusb-0.1-4 login
+  manpages nano netcat passwd readline-common sysklogd sysv-rc sysvinit
+  whiptail
+35 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
+Need to get 0B/18.0MB of archives.
+After unpacking 1786kB of additional disk space will be used.
+(Reading database ... 11215 files and directories currently installed.)
 Preparing to replace libc6-dev 2.3.6-3 (using .../libc6-dev_2.3.6-4_amd64.deb) ...
 Unpacking replacement libc6-dev ...
 Preparing to replace libc6 2.3.6-3 (using .../libc6_2.3.6-4_amd64.deb) ...
 Unpacking replacement libc6 ...
 Setting up libc6 (2.3.6-4) ...
 Current default timezone: 'UTC'.
-Local time is now:      Sat Apr  1 03:21:23 UTC 2006.
-Universal Time is now:  Sat Apr  1 03:21:23 UTC 2006.
+Local time is now:      Mon Apr  3 03:38:34 UTC 2006.
+Universal Time is now:  Mon Apr  3 03:38:34 UTC 2006.
 Run 'tzconfig' if you wish to change it.
 
-(Reading database ... 11215 files and directories currently installed.)
+(Reading database ... 11216 files and directories currently installed.)
 Preparing to replace libslang2 2.0.5-3 (using .../libslang2_2.0.6-2_amd64.deb) ...
 Unpacking replacement libslang2 ...
 Setting up libslang2 (2.0.6-2) ...
 
-(Reading database ... 11215 files and directories currently installed.)
+(Reading database ... 11216 files and directories currently installed.)
 Preparing to replace whiptail 0.51.6-31 (using .../whiptail_0.52.2-3_amd64.deb) ...
 Unpacking replacement whiptail ...
-(Reading database ... 11214 files and directories currently installed.)
+(Reading database ... 11215 files and directories currently installed.)
 Removing libnewt0.51 ...
 Selecting previously deselected package libnewt0.52.
-(Reading database ... 11153 files and directories currently installed.)
+(Reading database ... 11154 files and directories currently installed.)
 Unpacking libnewt0.52 (from .../libnewt0.52_0.52.2-3_amd64.deb) ...
 Preparing to replace bash 3.1-2 (using .../archives/bash_3.1-4_amd64.deb) ...
 Unpacking replacement bash ...
@@ -62,48 +62,43 @@ Setting up bash (3.1-4) ...
 Installing new version of config file /etc/bash_completion ...
 Installing new version of config file /etc/skel/.bashrc ...
 
-(Reading database ... 11223 files and directories currently installed.)
-Preparing to replace dpkg 1.13.16 (using .../dpkg_1.13.17_amd64.deb) ...
-Unpacking replacement dpkg ...
-Setting up dpkg (1.13.17) ...
-
-(Reading database ... 11227 files and directories currently installed.)
+(Reading database ... 11224 files and directories currently installed.)
 Preparing to replace coreutils 5.2.1-2.1 (using .../coreutils_5.94-1_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.94-1) ...
 
-(Reading database ... 11248 files and directories currently installed.)
+(Reading database ... 11245 files and directories currently installed.)
 Preparing to replace login 1:4.0.14-9 (using .../login_1%3a4.0.15-1_amd64.deb) ...
 Unpacking replacement login ...
 Setting up login (4.0.15-1) ...
 Installing new version of config file /etc/pam.d/login ...
 Installing new version of config file /etc/pam.d/su ...
 
-(Reading database ... 11253 files and directories currently installed.)
+(Reading database ... 11250 files and directories currently installed.)
 Preparing to replace libsepol1 1.10-2 (using .../libsepol1_1.12-1_amd64.deb) ...
 Unpacking replacement libsepol1 ...
 Setting up libsepol1 (1.12-1) ...
 
-(Reading database ... 11253 files and directories currently installed.)
+(Reading database ... 11250 files and directories currently installed.)
 Preparing to replace libselinux1 1.28-4 (using .../libselinux1_1.30-1_amd64.deb) ...
 Unpacking replacement libselinux1 ...
 Setting up libselinux1 (1.30-1) ...
 
-(Reading database ... 11253 files and directories currently installed.)
+(Reading database ... 11250 files and directories currently installed.)
 Preparing to replace sysvinit 2.86.ds1-13 (using .../sysvinit_2.86.ds1-14_amd64.deb) ...
 Unpacking replacement sysvinit ...
 Setting up sysvinit (2.86.ds1-14) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 11253 files and directories currently installed.)
+(Reading database ... 11250 files and directories currently installed.)
 Preparing to replace initscripts 2.86.ds1-13 (using .../initscripts_2.86.ds1-14_amd64.deb) ...
 Unpacking replacement initscripts ...
 Setting up initscripts (2.86.ds1-14) ...
 Installing new version of config file /etc/init.d/umountfs ...
 
-(Reading database ... 11253 files and directories currently installed.)
+(Reading database ... 11250 files and directories currently installed.)
 Preparing to replace libattr1 2.4.31-1 (using .../libattr1_2.4.32-1_amd64.deb) ...
 Unpacking replacement libattr1 ...
 Preparing to replace libacl1 2.2.35-1 (using .../libacl1_2.2.36-1_amd64.deb) ...
@@ -112,12 +107,26 @@ Setting up libattr1 (2.4.32-1) ...
 
 Setting up libacl1 (2.2.36-1) ...
 
-(Reading database ... 11253 files and directories currently installed.)
+Selecting previously deselected package gcc-4.1-base.
+(Reading database ... 11250 files and directories currently installed.)
+Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1.0-1_amd64.deb) ...
+Preparing to replace libgcc1 1:4.0.3-1 (using .../libgcc1_1%3a4.1.0-1_amd64.deb) ...
+Unpacking replacement libgcc1 ...
+Setting up gcc-4.1-base (4.1.0-1) ...
+
+Setting up libgcc1 (4.1.0-1) ...
+
+(Reading database ... 11258 files and directories currently installed.)
+Preparing to replace libstdc++6 4.0.3-1 (using .../libstdc++6_4.1.0-1_amd64.deb) ...
+Unpacking replacement libstdc++6 ...
+Setting up libstdc++6 (4.1.0-1) ...
+
+(Reading database ... 11258 files and directories currently installed.)
 Preparing to replace sysv-rc 2.86.ds1-13 (using .../sysv-rc_2.86.ds1-14_all.deb) ...
 Unpacking replacement sysv-rc ...
 Setting up sysv-rc (2.86.ds1-14) ...
 
-(Reading database ... 11253 files and directories currently installed.)
+(Reading database ... 11258 files and directories currently installed.)
 Preparing to replace dmidecode 2.8-1 (using .../dmidecode_2.8-2_amd64.deb) ...
 Unpacking replacement dmidecode ...
 Preparing to replace info 4.8-6 (using .../archives/info_4.8-8_amd64.deb) ...
@@ -132,26 +141,20 @@ Preparing to replace libsasl2 2.1.19-1.9 (using .../libsasl2_2.1.19-1.9+b1_amd64
 Unpacking replacement libsasl2 ...
 Preparing to replace libssl0.9.8 0.9.8a-7 (using .../libssl0.9.8_0.9.8a-8_amd64.deb) ...
 Unpacking replacement libssl0.9.8 ...
-Preparing to replace libusb-0.1-4 2:0.1.11-4 (using .../libusb-0.1-4_2%3a0.1.11-7_amd64.deb) ...
+Preparing to replace libusb-0.1-4 2:0.1.11-4 (using .../libusb-0.1-4_2%3a0.1.12-1_amd64.deb) ...
 Unpacking replacement libusb-0.1-4 ...
+Preparing to replace manpages 2.22-1 (using .../manpages_2.23-1_all.deb) ...
+Unpacking replacement manpages ...
 Preparing to replace nano 1.3.10-2 (using .../nano_1.3.11-1_amd64.deb) ...
 Unpacking replacement nano ...
-Preparing to replace netbase 4.24 (using .../archives/netbase_4.25_all.deb) ...
-Unpacking replacement netbase ...
 Preparing to replace netcat 1.10-31 (using .../netcat_1.10-32_amd64.deb) ...
 Unpacking replacement netcat ...
-Preparing to replace dselect 1.13.16 (using .../dselect_1.13.17_amd64.deb) ...
-Unpacking replacement dselect ...
 Preparing to replace libdb4.3 4.3.29-4.1 (using .../libdb4.3_4.3.29-5_amd64.deb) ...
 Unpacking replacement libdb4.3 ...
 Preparing to replace passwd 1:4.0.14-9 (using .../passwd_1%3a4.0.15-1_amd64.deb) ...
 Unpacking replacement passwd ...
 Preparing to replace cpp 4:4.0.2-2 (using .../cpp_4%3a4.0.3-1_amd64.deb) ...
 Unpacking replacement cpp ...
-Preparing to replace make 3.80+3.81.rc1-1 (using .../make_3.80+3.81.rc2-1_amd64.deb) ...
-Unpacking replacement make ...
-Preparing to replace dpkg-dev 1.13.16 (using .../dpkg-dev_1.13.17_all.deb) ...
-Unpacking replacement dpkg-dev ...
 Preparing to replace gcc 4:4.0.2-2 (using .../gcc_4%3a4.0.3-1_amd64.deb) ...
 Removing old gcc doc directory.
 Unpacking replacement gcc ...
@@ -175,22 +178,17 @@ Setting up libsasl2 (2.1.19-1.9+b1) ...
 
 Setting up libssl0.9.8 (0.9.8a-8) ...
 
-Setting up libusb-0.1-4 (0.1.11-7) ...
+Setting up libusb-0.1-4 (0.1.12-1) ...
 
+Setting up manpages (2.23-1) ...
 Setting up nano (1.3.11-1) ...
 
-Setting up netbase (4.25) ...
-Installing new version of config file /etc/services ...
-
 Setting up netcat (1.10-32) ...
-Setting up dselect (1.13.17) ...
 Setting up libdb4.3 (4.3.29-5) ...
 Setting up passwd (4.0.15-1) ...
 
 Setting up cpp (4.0.3-1) ...
 
-Setting up make (3.80+3.81.rc2-1) ...
-Setting up dpkg-dev (1.13.17) ...
 Setting up gcc (4.0.3-1) ...
 
 Setting up g++ (4.0.3-1) ...
@@ -219,9 +217,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//21353/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//23433/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.tQtcio/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//21353 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//23433 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 5f28fca..6667325 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.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//23781/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//24101/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 [5902B]
 Ign http://ftp.jp.debian.org sid Release
-Get:5 http://ftp.jp.debian.org experimental/main Packages [154kB]
+Get:5 http://ftp.jp.debian.org experimental/main Packages [158kB]
 Hit http://ftp.jp.debian.org sid/main Packages
-Fetched 164kB in 0s (423kB/s)
+Fetched 169kB in 3s (48.4kB/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?)
@@ -29,35 +29,26 @@ dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
 Reading package lists...
 Building dependency tree...
-The following NEW packages will be installed:
-  gcc-4.1-base
 The following packages have been kept back:
   apt apt-utils
 The following packages will be upgraded:
-  aptitude diff gettext-base libgcc1 libstdc++6
-5 upgraded, 1 newly installed, 0 to remove and 2 not upgraded.
-Need to get 0B/3468kB of archives.
-After unpacking 578kB of additional disk space will be used.
+  aptitude diff gettext-base lsb-base
+4 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.
+Need to get 13.2kB/2979kB of archives.
+After unpacking 315kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
-  diff gcc-4.1-base libgcc1 libstdc++6 aptitude gettext-base
-(Reading database ... 12576 files and directories currently installed.)
+  diff lsb-base aptitude gettext-base
+Get:1 http://ftp.jp.debian.org experimental/main lsb-base 3.1-1 [13.2kB]
+Fetched 13.2kB in 3s (4150B/s)
+(Reading database ... 12586 files and directories currently installed.)
 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 ... 12584 files and directories currently installed.)
-Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1.0-0_amd64.deb) ...
-Preparing to replace libgcc1 1:4.0.3-1 (using .../libgcc1_1%3a4.1.0-0_amd64.deb) ...
-Unpacking replacement libgcc1 ...
-Setting up gcc-4.1-base (4.1.0-0) ...
-Setting up libgcc1 (4.1.0-0) ...
-
-(Reading database ... 12590 files and directories currently installed.)
-Preparing to replace libstdc++6 4.0.3-1 (using .../libstdc++6_4.1.0-0_amd64.deb) ...
-Unpacking replacement libstdc++6 ...
-Setting up libstdc++6 (4.1.0-0) ...
-
-(Reading database ... 12590 files and directories currently installed.)
+(Reading database ... 12594 files and directories currently installed.)
+Preparing to replace lsb-base 3.0-16 (using .../lsb-base_3.1-1_all.deb) ...
+Unpacking replacement lsb-base ...
+Setting up lsb-base (3.1-1) ...
+(Reading database ... 12594 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) ...
@@ -85,10 +76,10 @@ Need to get 0B/1535kB of archives.
 After unpacking 9683kB disk space will be freed.
 WARNING: The following packages cannot be authenticated!
   apt-utils apt
-(Reading database ... 12590 files and directories currently installed.)
+(Reading database ... 12594 files and directories currently installed.)
 Removing tasksel ...
 Removing aptitude ...
-(Reading database ... 12385 files and directories currently installed.)
+(Reading database ... 12389 files and directories currently installed.)
 Preparing to replace apt-utils 0.6.43.3 (using .../apt-utils_0.6.43.3exp1_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Preparing to replace apt 0.6.43.3 (using .../apt_0.6.43.3exp1_amd64.deb) ...
@@ -98,15 +89,16 @@ Setting up apt (0.6.43.3exp1) ...
 Setting up apt-utils (0.6.43.3exp1) ...
 
 Copying back the cached apt archive contents
+ -> new cache content lsb-base_3.1-1_all.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//23781/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//24101/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.tQtcio/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//23781 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//24101 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-sarge-etch-sid.log b/testsuite/normal/pbuilder-update-sarge-etch-sid.log
index ee17020..8e4aaf7 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.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//21831/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//22182/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 [5902B]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [4015kB]
-Fetched 4021kB in 2s (1683kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [4028kB]
+Fetched 4034kB in 18s (223kB/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,47 +25,45 @@ Building dependency tree...
 The following packages will be REMOVED:
   libnewt0.51
 The following NEW packages will be installed:
-  libnewt0.52
+  gcc-4.1-base libnewt0.52
 The following packages will be upgraded:
-  base-config bash console-data coreutils cpp dmidecode dpkg dpkg-dev dselect
-  exim4 exim4-base exim4-config exim4-daemon-light g++ gcc info initscripts
-  klogd libacl1 libattr1 libc6 libc6-dev libdb3 libdb4.2 libdb4.3 libdb4.4
-  libselinux1 libsepol1 libslang2 libssl0.9.8 login make nano netbase passwd
+  base-config bash console-data coreutils cpp dmidecode exim4 exim4-base
+  exim4-config exim4-daemon-light g++ gcc info initscripts klogd libacl1
+  libattr1 libc6 libc6-dev libdb4.2 libdb4.3 libdb4.4 libgcc1 libselinux1
+  libsepol1 libslang2 libssl0.9.8 libstdc++6 login manpages nano passwd
   pciutils sysklogd sysv-rc sysvinit whiptail
-40 upgraded, 1 newly installed, 1 to remove and 0 not upgraded.
-Need to get 167kB/22.3MB of archives.
-After unpacking 1368kB of additional disk space will be used.
+37 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
+Need to get 0B/20.4MB of archives.
+After unpacking 1606kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
-  libc6-dev libc6 libslang2 whiptail libnewt0.52 bash dpkg coreutils login
-  libsepol1 libselinux1 sysvinit initscripts libattr1 libacl1 sysv-rc
-  dmidecode info sysklogd klogd libssl0.9.8 nano netbase dselect libdb4.3
-  passwd cpp make dpkg-dev libdb4.2 exim4-config exim4-base exim4-daemon-light
-  exim4 gcc g++ libdb4.4 console-data libdb3 pciutils base-config
-Get:1 http://ftp.jp.debian.org sid/main pciutils 1:2.1.11-16 [167kB]
-Fetched 167kB in 0s (728kB/s)
-(Reading database ... 12648 files and directories currently installed.)
+  libc6-dev libc6 libslang2 whiptail libnewt0.52 bash coreutils login
+  libsepol1 libselinux1 sysvinit initscripts libattr1 libacl1 gcc-4.1-base
+  libgcc1 libstdc++6 sysv-rc dmidecode info sysklogd klogd libssl0.9.8
+  manpages nano libdb4.3 passwd cpp libdb4.2 exim4-config exim4-base
+  exim4-daemon-light exim4 gcc g++ libdb4.4 console-data pciutils base-config
+(Reading database ... 12650 files and directories currently installed.)
 Preparing to replace libc6-dev 2.3.6-3 (using .../libc6-dev_2.3.6-4_amd64.deb) ...
 Unpacking replacement libc6-dev ...
 Preparing to replace libc6 2.3.6-3 (using .../libc6_2.3.6-4_amd64.deb) ...
 Unpacking replacement libc6 ...
 Setting up libc6 (2.3.6-4) ...
 Current default timezone: 'UTC'.
-Local time is now:      Sat Apr  1 03:13:43 UTC 2006.
-Universal Time is now:  Sat Apr  1 03:13:43 UTC 2006.
+Local time is now:      Mon Apr  3 03:26:48 UTC 2006.
+Universal Time is now:  Mon Apr  3 03:26:48 UTC 2006.
 Run 'tzconfig' if you wish to change it.
 
-(Reading database ... 12649 files and directories currently installed.)
+(Reading database ... 12651 files and directories currently installed.)
 Preparing to replace libslang2 2.0.5-3 (using .../libslang2_2.0.6-2_amd64.deb) ...
 Unpacking replacement libslang2 ...
 Setting up libslang2 (2.0.6-2) ...
 
-(Reading database ... 12649 files and directories currently installed.)
+(Reading database ... 12651 files and directories currently installed.)
 Preparing to replace whiptail 0.51.6-31 (using .../whiptail_0.52.2-3_amd64.deb) ...
 Unpacking replacement whiptail ...
-(Reading database ... 12648 files and directories currently installed.)
+(Reading database ... 12650 files and directories currently installed.)
 Removing libnewt0.51 ...
 Selecting previously deselected package libnewt0.52.
-(Reading database ... 12587 files and directories currently installed.)
+(Reading database ... 12589 files and directories currently installed.)
 Unpacking libnewt0.52 (from .../libnewt0.52_0.52.2-3_amd64.deb) ...
 Preparing to replace bash 3.1-2 (using .../archives/bash_3.1-4_amd64.deb) ...
 Unpacking replacement bash ...
@@ -73,48 +71,43 @@ Setting up bash (3.1-4) ...
 Installing new version of config file /etc/bash_completion ...
 Installing new version of config file /etc/skel/.bashrc ...
 
-(Reading database ... 12657 files and directories currently installed.)
-Preparing to replace dpkg 1.13.16 (using .../dpkg_1.13.17_amd64.deb) ...
-Unpacking replacement dpkg ...
-Setting up dpkg (1.13.17) ...
-
-(Reading database ... 12661 files and directories currently installed.)
+(Reading database ... 12659 files and directories currently installed.)
 Preparing to replace coreutils 5.2.1-2.1 (using .../coreutils_5.94-1_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.94-1) ...
 
-(Reading database ... 12681 files and directories currently installed.)
+(Reading database ... 12679 files and directories currently installed.)
 Preparing to replace login 1:4.0.14-9 (using .../login_1%3a4.0.15-1_amd64.deb) ...
 Unpacking replacement login ...
 Setting up login (4.0.15-1) ...
 Installing new version of config file /etc/pam.d/login ...
 Installing new version of config file /etc/pam.d/su ...
 
-(Reading database ... 12686 files and directories currently installed.)
+(Reading database ... 12684 files and directories currently installed.)
 Preparing to replace libsepol1 1.10-2 (using .../libsepol1_1.12-1_amd64.deb) ...
 Unpacking replacement libsepol1 ...
 Setting up libsepol1 (1.12-1) ...
 
-(Reading database ... 12686 files and directories currently installed.)
+(Reading database ... 12684 files and directories currently installed.)
 Preparing to replace libselinux1 1.28-4 (using .../libselinux1_1.30-1_amd64.deb) ...
 Unpacking replacement libselinux1 ...
 Setting up libselinux1 (1.30-1) ...
 
-(Reading database ... 12686 files and directories currently installed.)
+(Reading database ... 12684 files and directories currently installed.)
 Preparing to replace sysvinit 2.86.ds1-13 (using .../sysvinit_2.86.ds1-14_amd64.deb) ...
 Unpacking replacement sysvinit ...
 Setting up sysvinit (2.86.ds1-14) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 12686 files and directories currently installed.)
+(Reading database ... 12684 files and directories currently installed.)
 Preparing to replace initscripts 2.86.ds1-13 (using .../initscripts_2.86.ds1-14_amd64.deb) ...
 Unpacking replacement initscripts ...
 Setting up initscripts (2.86.ds1-14) ...
 Installing new version of config file /etc/init.d/umountfs ...
 
-(Reading database ... 12686 files and directories currently installed.)
+(Reading database ... 12684 files and directories currently installed.)
 Preparing to replace libattr1 2.4.31-1 (using .../libattr1_2.4.32-1_amd64.deb) ...
 Unpacking replacement libattr1 ...
 Preparing to replace libacl1 2.2.35-1 (using .../libacl1_2.2.36-1_amd64.deb) ...
@@ -123,12 +116,26 @@ Setting up libattr1 (2.4.32-1) ...
 
 Setting up libacl1 (2.2.36-1) ...
 
-(Reading database ... 12686 files and directories currently installed.)
+Selecting previously deselected package gcc-4.1-base.
+(Reading database ... 12684 files and directories currently installed.)
+Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1.0-1_amd64.deb) ...
+Preparing to replace libgcc1 1:4.0.3-1 (using .../libgcc1_1%3a4.1.0-1_amd64.deb) ...
+Unpacking replacement libgcc1 ...
+Setting up gcc-4.1-base (4.1.0-1) ...
+
+Setting up libgcc1 (4.1.0-1) ...
+
+(Reading database ... 12692 files and directories currently installed.)
+Preparing to replace libstdc++6 4.0.3-1 (using .../libstdc++6_4.1.0-1_amd64.deb) ...
+Unpacking replacement libstdc++6 ...
+Setting up libstdc++6 (4.1.0-1) ...
+
+(Reading database ... 12692 files and directories currently installed.)
 Preparing to replace sysv-rc 2.86.ds1-13 (using .../sysv-rc_2.86.ds1-14_all.deb) ...
 Unpacking replacement sysv-rc ...
 Setting up sysv-rc (2.86.ds1-14) ...
 
-(Reading database ... 12686 files and directories currently installed.)
+(Reading database ... 12692 files and directories currently installed.)
 Preparing to replace dmidecode 2.8-1 (using .../dmidecode_2.8-2_amd64.deb) ...
 Unpacking replacement dmidecode ...
 Preparing to replace info 4.8-6 (using .../archives/info_4.8-8_amd64.deb) ...
@@ -139,22 +146,16 @@ Preparing to replace klogd 1.4.1-17 (using .../klogd_1.4.1-17.1_amd64.deb) ...
 Unpacking replacement klogd ...
 Preparing to replace libssl0.9.8 0.9.8a-7 (using .../libssl0.9.8_0.9.8a-8_amd64.deb) ...
 Unpacking replacement libssl0.9.8 ...
+Preparing to replace manpages 2.22-1 (using .../manpages_2.23-1_all.deb) ...
+Unpacking replacement manpages ...
 Preparing to replace nano 1.3.10-2 (using .../nano_1.3.11-1_amd64.deb) ...
 Unpacking replacement nano ...
-Preparing to replace netbase 4.24 (using .../archives/netbase_4.25_all.deb) ...
-Unpacking replacement netbase ...
-Preparing to replace dselect 1.13.16 (using .../dselect_1.13.17_amd64.deb) ...
-Unpacking replacement dselect ...
 Preparing to replace libdb4.3 4.3.29-4.1 (using .../libdb4.3_4.3.29-5_amd64.deb) ...
 Unpacking replacement libdb4.3 ...
 Preparing to replace passwd 1:4.0.14-9 (using .../passwd_1%3a4.0.15-1_amd64.deb) ...
 Unpacking replacement passwd ...
 Preparing to replace cpp 4:4.0.2-2 (using .../cpp_4%3a4.0.3-1_amd64.deb) ...
 Unpacking replacement cpp ...
-Preparing to replace make 3.80+3.81.rc1-1 (using .../make_3.80+3.81.rc2-1_amd64.deb) ...
-Unpacking replacement make ...
-Preparing to replace dpkg-dev 1.13.16 (using .../dpkg-dev_1.13.17_all.deb) ...
-Unpacking replacement dpkg-dev ...
 Preparing to replace libdb4.2 4.2.52-23.1 (using .../libdb4.2_4.2.52-24_amd64.deb) ...
 Unpacking replacement libdb4.2 ...
 Preparing to replace exim4-config 4.60-4 (using .../exim4-config_4.60-5_all.deb) ...
@@ -174,8 +175,6 @@ Preparing to replace libdb4.4 4.4.20-3 (using .../libdb4.4_4.4.20-4_amd64.deb) .
 Unpacking replacement libdb4.4 ...
 Preparing to replace console-data 2002.12.04dbs-52.2 (using .../console-data_20060317_all.deb) ...
 Unpacking replacement console-data ...
-Preparing to replace libdb3 3.2.9-23 (using .../libdb3_3.2.9-25_amd64.deb) ...
-Unpacking replacement libdb3 ...
 Preparing to replace pciutils 1:2.1.11-15.3 (using .../pciutils_1%3a2.1.11-16_amd64.deb) ...
 Unpacking replacement pciutils ...
 Preparing to replace base-config 2.53.10-0.0.0.1.pure64 (using .../base-config_2.76_all.deb) ...
@@ -189,19 +188,14 @@ Setting up info (4.8-8) ...
 
 Setting up libssl0.9.8 (0.9.8a-8) ...
 
+Setting up manpages (2.23-1) ...
 Setting up nano (1.3.11-1) ...
 
-Setting up netbase (4.25) ...
-Installing new version of config file /etc/services ...
-
-Setting up dselect (1.13.17) ...
 Setting up libdb4.3 (4.3.29-5) ...
 Setting up passwd (4.0.15-1) ...
 
 Setting up cpp (4.0.3-1) ...
 
-Setting up make (3.80+3.81.rc2-1) ...
-Setting up dpkg-dev (1.13.17) ...
 Setting up libdb4.2 (4.2.52-24) ...
 Setting up exim4-config (4.60-5) ...
 Installing new version of config file /etc/exim4/conf.d/acl/20_exim4-config_whitelist_local_deny ...
@@ -221,8 +215,6 @@ Setting up console-data (20060317) ...
 Looking for keymap to install:
 NONE
 
-Setting up libdb3 (3.2.9-25) ...
-
 Setting up pciutils (2.1.11-16) ...
 
 Setting up base-config (2.76) ...
@@ -240,16 +232,15 @@ 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 pciutils_1%3a2.1.11-16_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//21831/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//22182/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.tQtcio/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//21831 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//22182 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-sarge-etch.log b/testsuite/normal/pbuilder-update-sarge-etch.log
index b94df6e..c17f970 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.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/var/cache/pbuilder/build//17772/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/var/cache/pbuilder/build//17003/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 [3724kB]
+Get:1 http://ftp.jp.debian.org etch/main Packages [3730kB]
 Get:2 http://ftp.jp.debian.org etch/main Release [96B]
-Fetched 3724kB in 2s (1614kB/s)
+Fetched 3730kB in 2s (1777kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -42,7 +42,7 @@ The following packages will be upgraded:
   perl-modules ppp pppconfig pppoeconf procps psmisc sed sysv-rc sysvinit tar
   tasksel tcpd telnet util-linux wget whiptail zlib1g
 123 upgraded, 19 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/65.0MB of archives.
+Need to get 0B/64.9MB of archives.
 After unpacking 39.6MB of additional disk space will be used.
 (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.1_amd64.deb) ...
@@ -76,8 +76,8 @@ Unpacking replacement libc6 ...
 Setting up libc6 (2.3.6-3) ...
 Checking for services that may need to be restarted...done.
 Current default timezone: 'UTC'.
-Local time is now:      Sat Apr  1 03:12:11 UTC 2006.
-Universal Time is now:  Sat Apr  1 03:12:11 UTC 2006.
+Local time is now:      Mon Apr  3 03:25:04 UTC 2006.
+Universal Time is now:  Mon Apr  3 03:25:04 UTC 2006.
 Run 'tzconfig' if you wish to change it.
 
 (Reading database ... 11262 files and directories currently installed.)
@@ -125,68 +125,68 @@ Unpacking replacement coreutils ...
 Setting up coreutils (5.2.1-2.1) ...
 
 (Reading database ... 11278 files and directories currently installed.)
-Preparing to replace dpkg 1.10.28 (using .../dpkg_1.13.16_amd64.deb) ...
+Preparing to replace dpkg 1.10.28 (using .../dpkg_1.13.17_amd64.deb) ...
 Unpacking replacement dpkg ...
-Setting up dpkg (1.13.16) ...
+Setting up dpkg (1.13.17) ...
 Installing new version of config file /etc/dpkg/origins/debian ...
 Adding `local diversion of /usr/bin/md5sum.textutils to /usr/bin/md5sum'
 Adding `local diversion of /usr/share/man/man1/md5sum.textutils.1.gz to /usr/share/man/man1/md5sum.1.gz'
 
-(Reading database ... 11254 files and directories currently installed.)
+(Reading database ... 11257 files and directories currently installed.)
 Preparing to replace e2fslibs 1.37-2sarge1 (using .../e2fslibs_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement e2fslibs ...
 Setting up e2fslibs (1.38+1.39-WIP-2005.12.31-1) ...
 
-(Reading database ... 11254 files and directories currently installed.)
+(Reading database ... 11257 files and directories currently installed.)
 Preparing to replace e2fsprogs 1.37-2sarge1 (using .../e2fsprogs_1.38+1.39-WIP-2005.12.31-1_amd64.deb) ...
 Unpacking replacement e2fsprogs ...
 Replacing files in old package libuuid1 ...
 Replacing files in old package libblkid1 ...
 Setting up e2fsprogs (1.38+1.39-WIP-2005.12.31-1) ...
-(Reading database ... 11258 files and directories currently installed.)
+(Reading database ... 11261 files and directories currently installed.)
 Preparing to replace findutils 4.1.20-6 (using .../findutils_4.2.27-1_amd64.deb) ...
 Unpacking replacement findutils ...
 Setting up findutils (4.2.27-1) ...
 Installing new version of config file /etc/updatedb.conf ...
 
-(Reading database ... 11279 files and directories currently installed.)
+(Reading database ... 11282 files and directories currently installed.)
 Preparing to replace grep 2.5.1.ds1-4 (using .../grep_2.5.1.ds2-4_amd64.deb) ...
 Unpacking replacement grep ...
 Setting up grep (2.5.1.ds2-4) ...
 
-(Reading database ... 11278 files and directories currently installed.)
+(Reading database ... 11281 files and directories currently installed.)
 Preparing to replace gzip 1.3.5-10 (using .../gzip_1.3.5-12_amd64.deb) ...
 Unpacking replacement gzip ...
 Setting up gzip (1.3.5-12) ...
 
-(Reading database ... 11278 files and directories currently installed.)
+(Reading database ... 11281 files and directories currently installed.)
 Preparing to replace hostname 2.13 (using .../hostname_2.92_amd64.deb) ...
 Unpacking replacement hostname ...
 Setting up hostname (2.92) ...
 Selecting previously deselected package libdb4.3.
-(Reading database ... 11278 files and directories currently installed.)
+(Reading database ... 11281 files and directories currently installed.)
 Unpacking libdb4.3 (from .../libdb4.3_4.3.29-4.1_amd64.deb) ...
 Selecting previously deselected package libsepol1.
 Unpacking libsepol1 (from .../libsepol1_1.10-2_amd64.deb) ...
 Setting up libsepol1 (1.10-2) ...
 
 Selecting previously deselected package libselinux1.
-(Reading database ... 11287 files and directories currently installed.)
+(Reading database ... 11290 files and directories currently installed.)
 Unpacking libselinux1 (from .../libselinux1_1.28-4_amd64.deb) ...
 Setting up libselinux1 (1.28-4) ...
 
-(Reading database ... 11292 files and directories currently installed.)
+(Reading database ... 11295 files and directories currently installed.)
 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.1) ...
 Installing new version of config file /etc/pam.conf ...
 
-(Reading database ... 11292 files and directories currently installed.)
+(Reading database ... 11295 files and directories currently installed.)
 Preparing to replace libpam0g 0.76-22 (using .../libpam0g_0.79-3.1_amd64.deb) ...
 Unpacking replacement libpam0g ...
 Setting up libpam0g (0.79-3.1) ...
 
-(Reading database ... 11292 files and directories currently installed.)
+(Reading database ... 11295 files and directories currently installed.)
 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.1) ...
@@ -195,7 +195,7 @@ 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 ...
 
-(Reading database ... 11296 files and directories currently installed.)
+(Reading database ... 11299 files and directories currently installed.)
 Preparing to replace login 1:4.0.3-31sarge5 (using .../login_1%3a4.0.14-9_amd64.deb) ...
 Unpacking replacement login ...
 Setting up login (4.0.14-9) ...
@@ -203,16 +203,16 @@ Installing new version of config file /etc/pam.d/login ...
 Installing new version of config file /etc/pam.d/su ...
 Installing new version of config file /etc/login.defs ...
 
-(Reading database ... 11342 files and directories currently installed.)
+(Reading database ... 11345 files and directories currently installed.)
 Preparing to replace mount 2.12p-4 (using .../mount_2.12r-8_amd64.deb) ...
 Unpacking replacement mount ...
 Setting up mount (2.12r-8) ...
 
-(Reading database ... 11342 files and directories currently installed.)
+(Reading database ... 11345 files and directories currently installed.)
 Preparing to replace ncurses-bin 5.4-4 (using .../ncurses-bin_5.5-1_amd64.deb) ...
 Unpacking replacement ncurses-bin ...
 Setting up ncurses-bin (5.5-1) ...
-(Reading database ... 11342 files and directories currently installed.)
+(Reading database ... 11345 files and directories currently installed.)
 Preparing to replace perl-modules 5.8.4-8 (using .../perl-modules_5.8.8-3_all.deb) ...
 Unpacking replacement perl-modules ...
 Selecting previously deselected package libdb4.4.
@@ -222,46 +222,46 @@ Unpacking replacement libperl5.8 ...
 Preparing to replace perl-base 5.8.4-8 (using .../perl-base_5.8.8-3_amd64.deb) ...
 Unpacking replacement perl-base ...
 Setting up perl-base (5.8.8-3) ...
-(Reading database ... 11501 files and directories currently installed.)
+(Reading database ... 11504 files and directories currently installed.)
 Preparing to replace perl 5.8.4-8 (using .../perl_5.8.8-3_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 ... 11862 files and directories currently installed.)
+(Reading database ... 11865 files and directories currently installed.)
 Preparing to replace sysv-rc 2.86.ds1-1 (using .../sysv-rc_2.86.ds1-13_all.deb) ...
 Unpacking replacement sysv-rc ...
 Setting up sysv-rc (2.86.ds1-13) ...
 
-(Reading database ... 11872 files and directories currently installed.)
+(Reading database ... 11875 files and directories currently installed.)
 Preparing to replace sysvinit 2.86.ds1-1 (using .../sysvinit_2.86.ds1-13_amd64.deb) ...
 Unpacking replacement sysvinit ...
 Setting up sysvinit (2.86.ds1-13) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 11874 files and directories currently installed.)
+(Reading database ... 11877 files and directories currently installed.)
 Preparing to replace tar 1.14-2 (using .../tar_1.15.1-6_amd64.deb) ...
 Unpacking replacement tar ...
 Setting up tar (1.15.1-6) ...
 
 Selecting previously deselected package lsb-base.
-(Reading database ... 11878 files and directories currently installed.)
+(Reading database ... 11881 files and directories currently installed.)
 Unpacking lsb-base (from .../lsb-base_3.0-16_all.deb) ...
 Setting up lsb-base (3.0-16) ...
 Selecting previously deselected package libslang2.
-(Reading database ... 11885 files and directories currently installed.)
+(Reading database ... 11888 files and directories currently installed.)
 Unpacking libslang2 (from .../libslang2_2.0.5-3_amd64.deb) ...
 Setting up libslang2 (2.0.5-3) ...
 
-(Reading database ... 11897 files and directories currently installed.)
+(Reading database ... 11900 files and directories currently installed.)
 Preparing to replace util-linux 2.12p-4 (using .../util-linux_2.12r-8_amd64.deb) ...
 Unpacking replacement util-linux ...
 Setting up util-linux (2.12r-8) ...
 Installing new version of config file /etc/init.d/hwclock.sh ...
 Installing new version of config file /etc/init.d/hwclockfirst.sh ...
 
-(Reading database ... 11897 files and directories currently installed.)
+(Reading database ... 11900 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 ...
@@ -299,7 +299,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 ... 11901 files and directories currently installed.)
+(Reading database ... 11904 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) ...
@@ -325,7 +325,7 @@ Setting up libtext-wrapi18n-perl (0.06-4) ...
 Setting up debconf-i18n (1.4.72) ...
 Setting up debconf (1.4.72) ...
 
-(Reading database ... 11931 files and directories currently installed.)
+(Reading database ... 11934 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.
@@ -337,11 +337,11 @@ Setting up gcc-4.0-base (4.0.3-1) ...
 Setting up libgcc1 (4.0.3-1) ...
 
 Selecting previously deselected package libstdc++6.
-(Reading database ... 11944 files and directories currently installed.)
+(Reading database ... 11947 files and directories currently installed.)
 Unpacking libstdc++6 (from .../libstdc++6_4.0.3-1_amd64.deb) ...
 Setting up libstdc++6 (4.0.3-1) ...
 
-(Reading database ... 11947 files and directories currently installed.)
+(Reading database ... 11950 files and directories currently installed.)
 Preparing to replace apt-utils 0.5.28.6 (using .../apt-utils_0.6.43.3_amd64.deb) ...
 Unpacking replacement apt-utils ...
 Selecting previously deselected package libncursesw5.
@@ -354,12 +354,12 @@ Preparing to replace apt 0.5.28.6 (using .../apt_0.6.43.3_amd64.deb) ...
 Unpacking replacement apt ...
 Setting up apt (0.6.43.3) ...
 
-(Reading database ... 11978 files and directories currently installed.)
-Preparing to replace dselect 1.10.28 (using .../dselect_1.13.16_amd64.deb) ...
+(Reading database ... 11981 files and directories currently installed.)
+Preparing to replace dselect 1.10.28 (using .../dselect_1.13.17_amd64.deb) ...
 Unpacking replacement dselect ...
-Setting up dselect (1.13.16) ...
+Setting up dselect (1.13.17) ...
 Installing new version of config file /etc/dpkg/dselect.cfg ...
-(Reading database ... 12003 files and directories currently installed.)
+(Reading database ... 12006 files and directories currently installed.)
 Preparing to replace initscripts 2.86.ds1-1 (using .../initscripts_2.86.ds1-13_amd64.deb) ...
 Unmodified conffile '/etc/init.d/bootclean.sh' obsolete; removed `/etc/init.d/bootclean.sh'
 Unpacking replacement initscripts ...
@@ -382,7 +382,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 ... 12018 files and directories currently installed.)
+(Reading database ... 12021 files and directories currently installed.)
 Preparing to replace libattr1 2.4.16-1 (using .../libattr1_2.4.31-1_amd64.deb) ...
 Unpacking replacement libattr1 ...
 Preparing to replace libacl1 2.2.23-1 (using .../libacl1_2.2.35-1_amd64.deb) ...
@@ -391,27 +391,27 @@ Setting up libattr1 (2.4.31-1) ...
 
 Setting up libacl1 (2.2.35-1) ...
 
-(Reading database ... 12018 files and directories currently installed.)
+(Reading database ... 12021 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 ... 12018 files and directories currently installed.)
+(Reading database ... 12021 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 ... 12018 files and directories currently installed.)
+(Reading database ... 12021 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 ... 12018 files and directories currently installed.)
+(Reading database ... 12021 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 ... 12018 files and directories currently installed.)
+(Reading database ... 12021 files and directories currently installed.)
 Preparing to replace libgpg-error0 1.0-1 (using .../libgpg-error0_1.2-1_amd64.deb) ...
 Unpacking replacement libgpg-error0 ...
 Preparing to replace libgcrypt11 1.2.0-11.1 (using .../libgcrypt11_1.2.2-1_amd64.deb) ...
@@ -420,7 +420,7 @@ Preparing to replace zlib1g 1:1.2.2-4 (using .../zlib1g_1%3a1.2.3-11_amd64.deb)
 Unpacking replacement zlib1g ...
 Setting up zlib1g (1.2.3-11) ...
 
-(Reading database ... 12021 files and directories currently installed.)
+(Reading database ... 12024 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) ...
@@ -449,7 +449,7 @@ Preparing to replace tcpd 7.6.dbs-8 (using .../tcpd_7.6.dbs-9_amd64.deb) ...
 Unpacking replacement tcpd ...
 Preparing to replace iputils-ping 3:20020927-2 (using .../iputils-ping_3%3a20020927-3_amd64.deb) ...
 Unpacking replacement iputils-ping ...
-Preparing to replace netbase 4.21 (using .../archives/netbase_4.24_all.deb) ...
+Preparing to replace netbase 4.21 (using .../archives/netbase_4.25_all.deb) ...
 Unpacking replacement netbase ...
 Preparing to replace exim4-base 4.50-8 (using .../exim4-base_4.60-4_amd64.deb) ...
 Unpacking replacement exim4-base ...
@@ -459,7 +459,7 @@ Setting up passwd (4.0.14-9) ...
 Installing new version of config file /etc/pam.d/chfn ...
 Installing new version of config file /etc/pam.d/chsh ...
 
-(Reading database ... 12155 files and directories currently installed.)
+(Reading database ... 12159 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-13_amd64.deb) ...
@@ -477,7 +477,7 @@ Unpacking replacement libstdc++5 ...
 Setting up gcc-3.3-base (3.3.6-13) ...
 Setting up libstdc++5 (3.3.6-13) ...
 
-(Reading database ... 12177 files and directories currently installed.)
+(Reading database ... 12181 files and directories currently installed.)
 Preparing to replace bsdmainutils 6.0.17 (using .../bsdmainutils_6.1.3_amd64.deb) ...
 Unpacking replacement bsdmainutils ...
 Preparing to replace cpio 2.5-1.2 (using .../archives/cpio_2.6-11_amd64.deb) ...
@@ -533,9 +533,9 @@ Preparing to replace cpp 4:3.3.5-3 (using .../cpp_4%3a4.0.2-2_amd64.deb) ...
 Unpacking replacement cpp ...
 Preparing to replace patch 2.5.9-2 (using .../patch_2.5.9-4_amd64.deb) ...
 Unpacking replacement patch ...
-Preparing to replace make 3.80-9 (using .../make_3.80+3.81.rc1-1_amd64.deb) ...
+Preparing to replace make 3.80-9 (using .../make_3.80+3.81.rc2-1_amd64.deb) ...
 Unpacking replacement make ...
-Preparing to replace dpkg-dev 1.10.28 (using .../dpkg-dev_1.13.16_all.deb) ...
+Preparing to replace dpkg-dev 1.10.28 (using .../dpkg-dev_1.13.17_all.deb) ...
 Unpacking replacement dpkg-dev ...
 Preparing to replace exim4 4.50-8 (using .../archives/exim4_4.60-4_all.deb) ...
 Unpacking replacement exim4 ...
@@ -562,7 +562,7 @@ Preparing to replace build-essential 10.1 (using .../build-essential_11.2_amd64.
 Unpacking replacement build-essential ...
 Preparing to replace fdutils 5.4-20040228-1 (using .../fdutils_5.5-20050303-2_amd64.deb) ...
 Unpacking replacement fdutils ...
-Preparing to replace libdb3 3.2.9-22 (using .../libdb3_3.2.9-23_amd64.deb) ...
+Preparing to replace libdb3 3.2.9-22 (using .../libdb3_3.2.9-25_amd64.deb) ...
 Unpacking replacement libdb3 ...
 Selecting previously deselected package libpcap0.8.
 Unpacking libpcap0.8 (from .../libpcap0.8_0.9.4-1_amd64.deb) ...
@@ -648,7 +648,7 @@ Setting up libwrap0 (7.6.dbs-9) ...
 Setting up tcpd (7.6.dbs-9) ...
 
 Setting up iputils-ping (20020927-3) ...
-Setting up netbase (4.24) ...
+Setting up netbase (4.25) ...
 Installing new version of config file /etc/protocols ...
 Installing new version of config file /etc/init.d/networking ...
 Installing new version of config file /etc/services ...
@@ -721,8 +721,7 @@ Setting up cpp-4.0 (4.0.3-1) ...
 Setting up cpp (4.0.2-2) ...
 
 Setting up patch (2.5.9-4) ...
-Setting up make (3.80+3.81.rc1-1) ...
-
+Setting up make (3.80+3.81.rc2-1) ...
 Setting up exim4 (4.60-4) ...
 Setting up gcc-4.0 (4.0.3-1) ...
 Setting up gcc (4.0.2-2) ...
@@ -736,7 +735,7 @@ Setting up telnet (0.17-32) ...
 
 Setting up fdutils (5.5-20050303-2) ...
 
-Setting up libdb3 (3.2.9-23) ...
+Setting up libdb3 (3.2.9-25) ...
 
 Setting up libpcap0.8 (0.9.4-1) ...
 
@@ -773,9 +772,9 @@ Installing new version of config file /etc/init.d/console-screen.sh ...
 Setting up g++-3.3 (3.3.6-13) ...
 Setting up perl (5.8.8-3) ...
 
-Setting up dpkg-dev (1.13.16) ...
-Installing new version of config file /etc/dpkg/shlibs.default ...
+Setting up dpkg-dev (1.13.17) ...
 Installing new version of config file /etc/dpkg/shlibs.override ...
+Installing new version of config file /etc/dpkg/shlibs.default ...
 Setting up build-essential (11.2) ...
 Reading package lists...
 Building dependency tree...
@@ -790,9 +789,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//17772/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//17003/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.tQtcio/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//17772 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//17003 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-etch.log b/testsuite/normal/pdebuild-internal-etch.log
index 4480955..08576c3 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.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/14173/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/16220/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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/137kB of archives.
 After unpacking 758kB of additional disk space will be used.
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 11214 files and directories currently installed.)
+(Reading database ... 11215 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.11_amd64.deb) ...
 Selecting previously deselected package pbuilder.
-Unpacking pbuilder (from .../pbuilder_0.149_all.deb) ...
+Unpacking pbuilder (from .../pbuilder_0.150_all.deb) ...
 Setting up libdebian-installer4 (0.38) ...
 Setting up libdebian-installer-extra4 (0.38) ...
 Setting up cdebootstrap (0.3.11) ...
-Setting up pbuilder (0.149) ...
+Setting up pbuilder (0.150) ...
 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)
@@ -58,7 +58,7 @@ The following NEW packages will be installed:
 Need to get 0B/2910kB of archives.
 After unpacking 9699kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11311 files and directories currently installed.)
+(Reading database ... 11312 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-1_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-1_amd64.deb) ...
@@ -98,7 +98,7 @@ The following NEW packages will be installed:
 Need to get 0B/96.2kB of archives.
 After unpacking 401kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11905 files and directories currently installed.)
+(Reading database ... 11906 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
 Setting up fakeroot (1.5.8) ...
 
@@ -111,14 +111,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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -307,18 +307,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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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; \
@@ -331,26 +331,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.tQtcio/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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
@@ -401,7 +401,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 Apr  1 03:20:24 UTC 2006
+Mon Apr  3 03:37:29 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
@@ -471,13 +471,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 Apr  1 03:20:29 UTC 2006
+Mon Apr  3 03:37:34 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
@@ -487,9 +487,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -499,58 +499,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.tQtcio/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/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.tQtcio/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.c0ynuA/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.tQtcio/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.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/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.tQtcio/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/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.tQtcio/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.tQtcio/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.tQtcio/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.tQtcio/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/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.c0ynuA/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.c0ynuA/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.c0ynuA/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.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -589,6 +589,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.tQtcio/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/14173 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/16220 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-sarge.log b/testsuite/normal/pdebuild-internal-sarge.log
index 480ac7d..bd70c4a 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.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/10613/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/9747/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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
@@ -395,11 +395,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 Apr  1 03:11:15 UTC 2006
+Mon Apr  3 03:24:21 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 Apr  1 03:11:20 UTC 2006
+Mon Apr  3 03:24:26 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
@@ -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.tQtcio/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/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.tQtcio/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.c0ynuA/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.tQtcio/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.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/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.tQtcio/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/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.tQtcio/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.tQtcio/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.tQtcio/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.tQtcio/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/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.c0ynuA/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.c0ynuA/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.c0ynuA/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.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/10613 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/9747 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-sid.log b/testsuite/normal/pdebuild-internal-sid.log
index dc31d7c..0f37fb3 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.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/13230/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/10334/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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 $
@@ -21,23 +21,25 @@ Recommended packages:
 The following NEW packages will be installed:
   cdebootstrap libdebian-installer-extra4 libdebian-installer4 pbuilder
 0 upgraded, 4 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/138kB of archives.
+Need to get 75.9kB/138kB of archives.
 After unpacking 766kB of additional disk space will be used.
+Get:1 http://ftp.jp.debian.org sid/main pbuilder 0.151 [75.9kB]
+Fetched 75.9kB in 13s (5593B/s)
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 11255 files and directories currently installed.)
+(Reading database ... 11271 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.41_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.41_amd64.deb) ...
 Selecting previously deselected package cdebootstrap.
 Unpacking cdebootstrap (from .../cdebootstrap_0.3.11_amd64.deb) ...
 Selecting previously deselected package pbuilder.
-Unpacking pbuilder (from .../pbuilder_0.150_all.deb) ...
+Unpacking pbuilder (from .../pbuilder_0.151_all.deb) ...
 Setting up libdebian-installer4 (0.41) ...
 Setting up libdebian-installer-extra4 (0.41) ...
 Setting up cdebootstrap (0.3.11) ...
-Setting up pbuilder (0.150) ...
+Setting up pbuilder (0.151) ...
 Setting DEBBUILDOPTS=
- -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.23 2006/02/11 13:17:04 dancer Exp $
+ -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.24 2006/03/31 00:14:31 dancer Exp $
  -> Considering  debhelper (>> 3.0.0)
    -> Trying debhelper
  -> Considering  libdshconfig1-dev (>= 0.20.11-1)
@@ -58,7 +60,7 @@ The following NEW packages will be installed:
 Need to get 0B/2911kB of archives.
 After unpacking 9699kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11352 files and directories currently installed.)
+(Reading database ... 11368 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-1_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-1_amd64.deb) ...
@@ -98,7 +100,7 @@ The following NEW packages will be installed:
 Need to get 0B/96.2kB of archives.
 After unpacking 401kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11946 files and directories currently installed.)
+(Reading database ... 11962 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
 Setting up fakeroot (1.5.8) ...
 
@@ -111,14 +113,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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
 dh_clean: Compatibility levels before 4 are deprecated.
@@ -307,18 +309,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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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; \
@@ -331,26 +333,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.tQtcio/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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
@@ -362,7 +364,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
@@ -401,7 +402,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 Apr  1 03:06:02 UTC 2006
+Mon Apr  3 03:05: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
@@ -471,7 +472,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 Apr  1 03:06:07 UTC 2006
+Mon Apr  3 03:05:36 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -487,9 +488,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -499,58 +500,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.tQtcio/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/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.tQtcio/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.c0ynuA/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.tQtcio/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.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/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.tQtcio/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/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.tQtcio/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.tQtcio/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.tQtcio/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.tQtcio/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/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.c0ynuA/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.c0ynuA/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.c0ynuA/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.c0ynuA/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.c0ynuA/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -587,8 +588,9 @@ dpkg-deb: building package `dsh' in `../dsh_0.25.6-1_amd64.deb'.
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
+ -> new cache content pbuilder_0.151_all.deb added
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/13230 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/10334 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-etch.log b/testsuite/normal/pdebuild-normal-etch.log
index 7181201..edb818c 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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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 Apr  1 12:18:27 JST 2006
-pbuilder-time-stamp: 1143861507
+Current time: Mon Apr  3 12:36:00 JST 2006
+pbuilder-time-stamp: 1144035360
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/7413/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/9369/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -65,7 +65,7 @@ The following NEW packages will be installed:
 Need to get 0B/2910kB of archives.
 After unpacking 9699kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11214 files and directories currently installed.)
+(Reading database ... 11215 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-1_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-1_amd64.deb) ...
@@ -105,13 +105,13 @@ The following NEW packages will be installed:
 Need to get 0B/96.2kB of archives.
 After unpacking 401kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11808 files and directories currently installed.)
+(Reading database ... 11809 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
 Setting up fakeroot (1.5.8) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/7413/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/7413/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/9369/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/9369/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -440,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 Apr  1 03:19:23 UTC 2006
+Mon Apr  3 03:36:42 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
@@ -510,7 +510,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 Apr  1 03:19:28 UTC 2006
+Mon Apr  3 03:36:47 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -640,7 +640,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 Apr  1 12:19:30 JST 2006
-pbuilder-time-stamp: 1143861570
+Current time: Mon Apr  3 12:36:49 JST 2006
+pbuilder-time-stamp: 1144035409
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/7413 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/9369 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-sarge.log b/testsuite/normal/pdebuild-normal-sarge.log
index 0ff6f99..020c1d8 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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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 Apr  1 12:09:35 JST 2006
-pbuilder-time-stamp: 1143860975
+Current time: Mon Apr  3 12:22:58 JST 2006
+pbuilder-time-stamp: 1144034578
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/3707/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/2896/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.tQtcio/dir3/3707/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/3707/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/2896/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/2896/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -426,8 +426,8 @@ success
 success
 success
 success
-b: 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
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
@@ -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 Apr  1 03:10:23 UTC 2006
+Mon Apr  3 03:23:33 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,7 +511,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 Apr  1 03:10:28 UTC 2006
+Mon Apr  3 03:23:38 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -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 Apr  1 12:10:30 JST 2006
-pbuilder-time-stamp: 1143861030
+Current time: Mon Apr  3 12:23:40 JST 2006
+pbuilder-time-stamp: 1144034620
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/3707 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/2896 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-sid.log b/testsuite/normal/pdebuild-normal-sid.log
index 00d4f3c..4dd942f 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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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.tQtcio/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/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 Apr  1 12:03:55 JST 2006
-pbuilder-time-stamp: 1143860635
+Current time: Mon Apr  3 12:03:51 JST 2006
+pbuilder-time-stamp: 1144033431
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
-ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/6465/etc/mtab' to `../proc/mounts': File exists
+ln: creating symbolic link `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/3499/etc/mtab' to `../proc/mounts': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
@@ -65,7 +65,7 @@ The following NEW packages will be installed:
 Need to get 0B/2911kB of archives.
 After unpacking 9699kB of additional disk space will be used.
 Selecting previously deselected package libmagic1.
-(Reading database ... 11255 files and directories currently installed.)
+(Reading database ... 11271 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-1_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-1_amd64.deb) ...
@@ -105,13 +105,13 @@ The following NEW packages will be installed:
 Need to get 0B/96.2kB of archives.
 After unpacking 401kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
-(Reading database ... 11849 files and directories currently installed.)
+(Reading database ... 11865 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.8_amd64.deb) ...
 Setting up fakeroot (1.5.8) ...
 
 Copying back the cached apt archive contents
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/6465/etc/passwd
-/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/6465/etc/group
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/3499/etc/passwd
+/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/3499/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
@@ -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 Apr  1 03:04:53 UTC 2006
+Mon Apr  3 03:04: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
@@ -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 Apr  1 03:04:58 UTC 2006
+Mon Apr  3 03:04: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
+b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -641,7 +640,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 Apr  1 12:05:00 JST 2006
-pbuilder-time-stamp: 1143860700
+Current time: Mon Apr  3 12:04:38 JST 2006
+pbuilder-time-stamp: 1144033478
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.tQtcio/dir3/6465 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.c0ynuA/dir3/3499 and its subdirectories
author	dancer <dancer>	2006-04-03 13:16:57 +0000
committer	dancer <dancer>	2006-04-03 13:16:57 +0000
commit	0085d7461a7d1191a2fee4f035b0e7f6370871ef (patch)
tree	1f98529f4d0a30be8926e3294c9be24ddb6ae531 /testsuite
parent	a27e04a3b62c83efc0c4fbe29382c2a0acd0a77b (diff)
download	pbuilder-0085d7461a7d1191a2fee4f035b0e7f6370871ef.tar pbuilder-0085d7461a7d1191a2fee4f035b0e7f6370871ef.tar.gz