+ * depend on cdebootstrap, and suggest debootstrap. You may alternatively use

+    debootstrap, but the default is cdebootstrap.
+    (closes: #323843, #324648)
+  * cowdancer support improvement -- now passes testsuite.
+  * Standards-version: 3.6.2

update and re-run testsuite.

20 files changed, 1158 insertions, 968 deletions

diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
index 2124f9a..43a3202 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
@@ -2,10 +2,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/i386 $Id$
 $Id$
 
-Current time: Wed Aug 17 08:09:50 JST 2005
-pbuilder-time-stamp: 1124233790
+Current time: Thu Aug 25 10:05:20 JST 2005
+pbuilder-time-stamp: 1124931920
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -13,7 +13,7 @@ Building the build Environment
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
 Installing the build-deps
- -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.19 2005/06/03 12:07:39 dancer Exp $
+ -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.20 2005/08/17 00:46:54 dancer Exp $
  -> Considering  debhelper (>> 3.0.0)
    -> Trying debhelper
  -> Considering  libdshconfig1-dev (>= 0.20.11-1)
@@ -36,7 +36,7 @@ Need to get 2650kB of archives.
 After unpacking 8360kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main libmagic1 4.12-1 [233kB]
 Get:2 http://ftp.jp.debian.org etch/main file 4.12-1 [28.6kB]
-Get:3 http://ftp.jp.debian.org etch/main debconf-utils 1.4.52 [32.9kB]
+Get:3 http://ftp.jp.debian.org etch/main debconf-utils 1.4.57 [33.0kB]
 Get:4 http://ftp.jp.debian.org etch/main html2text 1.3.2a-2 [92.6kB]
 Get:5 http://ftp.jp.debian.org etch/main gettext 0.14.5-2 [1775kB]
 Get:6 http://ftp.jp.debian.org etch/main intltool-debian 0.30+20040213 [23.5kB]
@@ -44,14 +44,14 @@ Get:7 http://ftp.jp.debian.org etch/main po-debconf 0.8.23 [78.0kB]
 Get:8 http://ftp.jp.debian.org etch/main debhelper 4.9.5 [363kB]
 Get:9 http://ftp.jp.debian.org etch/main libdshconfig1 0.20.11-1 [10.7kB]
 Get:10 http://ftp.jp.debian.org etch/main libdshconfig1-dev 0.20.11-1 [12.4kB]
-Fetched 2650kB in 1s (1750kB/s)
+Fetched 2650kB in 1s (1498kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11328 files and directories currently installed.)
+(Reading database ... 11409 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.12-1_i386.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.12-1_i386.deb) ...
 Selecting previously deselected package debconf-utils.
-Unpacking debconf-utils (from .../debconf-utils_1.4.52_all.deb) ...
+Unpacking debconf-utils (from .../debconf-utils_1.4.57_all.deb) ...
 Selecting previously deselected package html2text.
 Unpacking html2text (from .../html2text_1.3.2a-2_i386.deb) ...
 Selecting previously deselected package gettext.
@@ -69,7 +69,7 @@ Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.11-1_i386.deb) ...
 Setting up libmagic1 (4.12-1) ...
 
 Setting up file (4.12-1) ...
-Setting up debconf-utils (1.4.52) ...
+Setting up debconf-utils (1.4.57) ...
 
 Setting up html2text (1.3.2a-2) ...
 
@@ -90,16 +90,19 @@ The following NEW packages will be installed:
 Need to get 70.4kB of archives.
 After unpacking 201kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main fakeroot 1.3 [70.4kB]
-Fetched 70.4kB in 0s (534kB/s)
+Fetched 70.4kB in 0s (533kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11871 files and directories currently installed.)
+(Reading database ... 11952 files and directories currently installed.)
 Unpacking fakeroot (from .../archives/fakeroot_1.3_i386.deb) ...
 Setting up fakeroot (1.3) ...
 
+/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/6680/etc/passwd
+/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/6680/etc/group
+/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/6680/etc/shadow
 Copying source file
-    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 dpkg-source: extracting dsh in dsh-0.25.6
@@ -415,7 +418,7 @@ PASS: tests/param-r-invalid.sh
 1: 1
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Tue Aug 16 23:10:36 UTC 2005
+Thu Aug 25 01:06:28 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -485,12 +488,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
-Tue Aug 16 23:10:42 UTC 2005
+Thu Aug 25 01:06:33 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-b: b
 a: a
+b: b
+dsh: Process terminated (before write).
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -595,10 +599,10 @@ debian: warning: no utmp entry available and LOGNAME not defined; using uid of p
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> Terminate timeout process
-/usr/lib/pbuilder/pbuilder-buildpackage: line 135:  3524 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
+/usr/lib/pbuilder/pbuilder-buildpackage: line 135:  6979 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Wed Aug 17 08:10:45 JST 2005
-pbuilder-time-stamp: 1124233845
+Current time: Thu Aug 25 10:06:40 JST 2005
+pbuilder-time-stamp: 1124932000
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/3229 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/6680 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log b/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log
index d4ba66c..eb504d9 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log
@@ -2,10 +2,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/i386 $Id$
 $Id$
 
-Current time: Wed Aug 17 07:55:00 JST 2005
-pbuilder-time-stamp: 1124232900
+Current time: Thu Aug 25 09:45:39 JST 2005
+pbuilder-time-stamp: 1124930739
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -13,7 +13,7 @@ Building the build Environment
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
 Installing the build-deps
- -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.19 2005/06/03 12:07:39 dancer Exp $
+ -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.20 2005/08/17 00:46:54 dancer Exp $
  -> Considering  debhelper (>> 3.0.0)
    -> Trying debhelper
  -> Considering  libdshconfig1-dev (>= 0.20.11-1)
@@ -44,7 +44,7 @@ Get:7 http://ftp.jp.debian.org sarge/main po-debconf 0.8.23 [78.0kB]
 Get:8 http://ftp.jp.debian.org sarge/main debhelper 4.2.32 [362kB]
 Get:9 http://ftp.jp.debian.org sarge/main libdshconfig1 0.20.11-1 [10.7kB]
 Get:10 http://ftp.jp.debian.org sarge/main libdshconfig1-dev 0.20.11-1 [12.4kB]
-Fetched 2591kB in 1s (2030kB/s)
+Fetched 2591kB in 2s (1005kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 11073 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.12-1_i386.deb) ...
@@ -90,16 +90,18 @@ The following NEW packages will be installed:
 Need to get 70.5kB of archives.
 After unpacking 201kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sarge/main fakeroot 1.2.10 [70.5kB]
-Fetched 70.5kB in 0s (537kB/s)
+Fetched 70.5kB in 0s (97.5kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 11615 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.2.10_i386.deb) ...
 Setting up fakeroot (1.2.10) ...
 
+/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/31752/etc/passwd
+/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/31752/etc/group
 Copying source file
-    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 dpkg-source: extracting dsh in dsh-0.25.6
@@ -374,6 +376,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
@@ -412,7 +415,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
-Tue Aug 16 22:55:42 UTC 2005
+Thu Aug 25 00:47:07 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -482,12 +485,11 @@ 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
-Tue Aug 16 22:55:47 UTC 2005
+Thu Aug 25 00:47:12 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-dsh: Process terminated (before write).
 b: b
 c: c
 PASS: tests/segv-catcher.sh
@@ -593,10 +595,10 @@ debian: warning: no utmp entry available and LOGNAME not defined; using uid of p
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> Terminate timeout process
-/usr/lib/pbuilder/pbuilder-buildpackage: line 135: 29588 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
+/usr/lib/pbuilder/pbuilder-buildpackage: line 135: 32080 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Wed Aug 17 07:55:49 JST 2005
-pbuilder-time-stamp: 1124232949
+Current time: Thu Aug 25 09:47:20 JST 2005
+pbuilder-time-stamp: 1124930840
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/29289 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/31752 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
index 7962f23..1896ae6 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
@@ -2,10 +2,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/i386 $Id$
 $Id$
 
-Current time: Wed Aug 17 07:47:31 JST 2005
-pbuilder-time-stamp: 1124232451
+Current time: Thu Aug 25 09:31:53 JST 2005
+pbuilder-time-stamp: 1124929913
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -13,7 +13,7 @@ Building the build Environment
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result/
 Installing the build-deps
- -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.19 2005/06/03 12:07:39 dancer Exp $
+ -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.20 2005/08/17 00:46:54 dancer Exp $
  -> Considering  debhelper (>> 3.0.0)
    -> Trying debhelper
  -> Considering  libdshconfig1-dev (>= 0.20.11-1)
@@ -47,9 +47,9 @@ Get:7 http://ftp.jp.debian.org sid/main po-debconf 0.8.23 [78.0kB]
 Get:8 http://ftp.jp.debian.org sid/main debhelper 4.9.5 [363kB]
 Get:9 http://ftp.jp.debian.org sid/main libdshconfig1 0.20.11-1 [10.7kB]
 Get:10 http://ftp.jp.debian.org sid/main libdshconfig1-dev 0.20.11-1 [12.4kB]
-Fetched 2650kB in 1s (1500kB/s)
+Fetched 2650kB in 3s (849kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11461 files and directories currently installed.)
+(Reading database ... 11459 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.12-1_i386.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.12-1_i386.deb) ...
@@ -90,21 +90,24 @@ Building dependency tree...
 The following NEW packages will be installed:
   fakeroot
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 69.5kB of archives.
+Need to get 69.6kB of archives.
 After unpacking 193kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
-Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.4.2 [69.5kB]
-Fetched 69.5kB in 0s (575kB/s)
+Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.4.3 [69.6kB]
+Fetched 69.6kB in 0s (760kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12004 files and directories currently installed.)
-Unpacking fakeroot (from .../fakeroot_1.4.2_i386.deb) ...
-Setting up fakeroot (1.4.2) ...
+(Reading database ... 12002 files and directories currently installed.)
+Unpacking fakeroot (from .../fakeroot_1.4.3_i386.deb) ...
+Setting up fakeroot (1.4.3) ...
 
+/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/27082/etc/passwd
+/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/27082/etc/group
+/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/27082/etc/shadow
 Copying source file
-    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 dpkg-source: extracting dsh in dsh-0.25.6
@@ -420,7 +423,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
-Tue Aug 16 22:48:31 UTC 2005
+Thu Aug 25 00:34:21 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -490,14 +493,13 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Tue Aug 16 22:48:36 UTC 2005
+Thu Aug 25 00:34:26 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-c: c
-dsh: Process terminated (before write).
 a: a
 b: b
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -601,10 +603,10 @@ debian: warning: no utmp entry available and LOGNAME not defined; using uid of p
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> Terminate timeout process
-/usr/lib/pbuilder/pbuilder-buildpackage: line 135: 27817 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
  -> unmounting dev/pts filesystem
+/usr/lib/pbuilder/pbuilder-modules: line 89: 27441 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
  -> unmounting proc filesystem
-Current time: Wed Aug 17 07:48:39 JST 2005
-pbuilder-time-stamp: 1124232519
+Current time: Thu Aug 25 09:34:39 JST 2005
+pbuilder-time-stamp: 1124930079
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir1/27523 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir1/27082 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-etch.log b/testsuite/cdebootstrap/pbuilder-create-etch.log
index f583a6d..a6c1bb9 100644
--- a/testsuite/cdebootstrap/pbuilder-create-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-create-etch.log
@@ -209,6 +209,10 @@ P: Retrieving sysvinit
 P: Validating sysvinit
 P: Retrieving console-data
 P: Validating console-data
+P: Retrieving ncurses-bin
+P: Validating ncurses-bin
+P: Retrieving lsb-base
+P: Validating lsb-base
 P: Retrieving console-common
 P: Validating console-common
 P: Retrieving console-tools
@@ -225,8 +229,6 @@ P: Retrieving pciutils
 P: Validating pciutils
 P: Retrieving setserial
 P: Validating setserial
-P: Retrieving ncurses-bin
-P: Validating ncurses-bin
 P: Retrieving hostname
 P: Validating hostname
 P: Retrieving grep
@@ -429,6 +431,7 @@ P: Configuring package apt
 P: Unpacking package console-data
 P: Unpacking package libconsole
 P: Unpacking package console-tools
+P: Unpacking package lsb-base
 P: Unpacking package console-common
 P: Unpacking package adduser
 P: Unpacking package libdb4.2
@@ -490,6 +493,7 @@ P: Unpacking package pppoeconf
 P: Unpacking package psmisc
 P: Unpacking package setserial
 P: Configuring package libconsole
+P: Configuring package lsb-base
 P: Configuring package adduser
 P: Configuring package libdb4.2
 P: Configuring package apt-utils
@@ -563,9 +567,9 @@ Refreshing the base.tgz
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
  -> installing dummy policy-rc.d
-Get:1 http://ftp.jp.debian.org etch/main Packages [3471kB]
+Get:1 http://ftp.jp.debian.org etch/main Packages [3487kB]
 Get:2 http://ftp.jp.debian.org etch/main Release [81B]
-Fetched 3471kB in 2s (1592kB/s)
+Fetched 3487kB in 2s (1191kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading Package Lists...
@@ -590,8 +594,8 @@ The following NEW packages will be installed:
   gcc-4.0-base libc6-dev libstdc++6 libstdc++6-4.0-dev linux-kernel-headers
   make patch perl perl-modules
 0 upgraded, 18 newly installed, 0 to remove and 0 not upgraded.
-Need to get 19.6MB of archives.
-After unpacking 69.3MB of additional disk space will be used.
+Need to get 19.7MB of archives.
+After unpacking 70.0MB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main binutils 2.16.1-2 [2378kB]
 Get:2 http://ftp.jp.debian.org etch/main gcc-4.0-base 4.0.1-2 [174kB]
 Get:3 http://ftp.jp.debian.org etch/main cpp-4.0 4.0.1-2 [2038kB]
@@ -604,15 +608,15 @@ Get:9 http://ftp.jp.debian.org etch/main dpkg-dev 1.13.10 [163kB]
 Get:10 http://ftp.jp.debian.org etch/main gcc-4.0 4.0.1-2 [495kB]
 Get:11 http://ftp.jp.debian.org etch/main gcc 4:4.0.1-3 [4918B]
 Get:12 http://ftp.jp.debian.org etch/main libstdc++6 4.0.1-2 [353kB]
-Get:13 http://ftp.jp.debian.org etch/main linux-kernel-headers 2.5.999-test7-bk-17 [1377kB]
+Get:13 http://ftp.jp.debian.org etch/main linux-kernel-headers 2.6.13+0rc3-1.1 [1544kB]
 Get:14 http://ftp.jp.debian.org etch/main libc6-dev 2.3.2.ds1-22 [2532kB]
 Get:15 http://ftp.jp.debian.org etch/main libstdc++6-4.0-dev 4.0.1-2 [1516kB]
 Get:16 http://ftp.jp.debian.org etch/main g++-4.0 4.0.1-2 [2321kB]
 Get:17 http://ftp.jp.debian.org etch/main g++ 4:4.0.1-3 [1384B]
 Get:18 http://ftp.jp.debian.org etch/main build-essential 11.1 [6834B]
-Fetched 19.6MB in 10s (1815kB/s)
+Fetched 19.7MB in 10s (1799kB/s)
 Selecting previously deselected package binutils.
-(Reading database ... 7623 files and directories currently installed.)
+(Reading database ... 7632 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.16.1-2_i386.deb) ...
 Selecting previously deselected package gcc-4.0-base.
 Unpacking gcc-4.0-base (from .../gcc-4.0-base_4.0.1-2_i386.deb) ...
@@ -637,7 +641,7 @@ Unpacking gcc (from .../gcc_4%3a4.0.1-3_i386.deb) ...
 Selecting previously deselected package libstdc++6.
 Unpacking libstdc++6 (from .../libstdc++6_4.0.1-2_i386.deb) ...
 Selecting previously deselected package linux-kernel-headers.
-Unpacking linux-kernel-headers (from .../linux-kernel-headers_2.5.999-test7-bk-17_i386.deb) ...
+Unpacking linux-kernel-headers (from .../linux-kernel-headers_2.6.13+0rc3-1.1_i386.deb) ...
 Selecting previously deselected package libc6-dev.
 Unpacking libc6-dev (from .../libc6-dev_2.3.2.ds1-22_i386.deb) ...
 Selecting previously deselected package libstdc++6-4.0-dev.
@@ -661,7 +665,7 @@ Setting up gcc (4.0.1-3) ...
 
 Setting up libstdc++6 (4.0.1-2) ...
 
-Setting up linux-kernel-headers (2.5.999-test7-bk-17) ...
+Setting up linux-kernel-headers (2.6.13+0rc3-1.1) ...
 Setting up libc6-dev (2.3.2.ds1-22) ...
 Setting up perl-modules (5.8.7-3) ...
 Setting up libstdc++6-4.0-dev (4.0.1-2) ...
@@ -674,6 +678,6 @@ Setting up g++ (4.0.1-3) ...
 Setting up build-essential (11.1) ...
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//19684 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//24342 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-sarge.log b/testsuite/cdebootstrap/pbuilder-create-sarge.log
index 9e8f806..f043641 100644
--- a/testsuite/cdebootstrap/pbuilder-create-sarge.log
+++ b/testsuite/cdebootstrap/pbuilder-create-sarge.log
@@ -554,7 +554,7 @@ Refreshing the base.tgz
  -> installing dummy policy-rc.d
 Get:1 http://ftp.jp.debian.org sarge/main Packages [3347kB]
 Get:2 http://ftp.jp.debian.org sarge/main Release [95B]
-Fetched 3347kB in 2s (1534kB/s)
+Fetched 3347kB in 2s (1481kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading Package Lists...
@@ -595,7 +595,7 @@ Get:13 http://ftp.jp.debian.org sarge/main libstdc++5-3.3-dev 1:3.3.5-13 [775kB]
 Get:14 http://ftp.jp.debian.org sarge/main g++-3.3 1:3.3.5-13 [1779kB]
 Get:15 http://ftp.jp.debian.org sarge/main g++ 4:3.3.5-3 [1398B]
 Get:16 http://ftp.jp.debian.org sarge/main build-essential 10.1 [6520B]
-Fetched 17.7MB in 8s (2025kB/s)
+Fetched 17.7MB in 9s (1840kB/s)
 Selecting previously deselected package binutils.
 (Reading database ... 7617 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.15-6_i386.deb) ...
@@ -652,6 +652,6 @@ Setting up g++ (3.3.5-3) ...
 Setting up build-essential (10.1) ...
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//12523 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//14812 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-sid.log b/testsuite/cdebootstrap/pbuilder-create-sid.log
index cafddd0..8515698 100644
--- a/testsuite/cdebootstrap/pbuilder-create-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-create-sid.log
@@ -129,6 +129,8 @@ P: Retrieving libgdbm3
 P: Validating libgdbm3
 P: Retrieving man-db
 P: Validating man-db
+P: Retrieving libselinux1
+P: Validating libselinux1
 P: Retrieving login
 P: Validating login
 P: Retrieving passwd
@@ -151,8 +153,8 @@ P: Retrieving libopencdk8
 P: Validating libopencdk8
 P: Retrieving libtasn1-2
 P: Validating libtasn1-2
-P: Retrieving libgnutls11
-P: Validating libgnutls11
+P: Retrieving libgnutls12
+P: Validating libgnutls12
 P: Retrieving libpcre3
 P: Validating libpcre3
 P: Retrieving exim4-daemon-light
@@ -187,16 +189,14 @@ P: Retrieving tasksel
 P: Validating tasksel
 P: Retrieving libconsole
 P: Validating libconsole
-P: Retrieving libblkid1
-P: Validating libblkid1
 P: Retrieving libuuid1
 P: Validating libuuid1
-P: Retrieving mount
-P: Validating mount
 P: Retrieving util-linux
 P: Validating util-linux
 P: Retrieving e2fslibs
 P: Validating e2fslibs
+P: Retrieving libblkid1
+P: Validating libblkid1
 P: Retrieving libcomerr2
 P: Validating libcomerr2
 P: Retrieving libss2
@@ -225,8 +225,6 @@ P: Retrieving base-config
 P: Validating base-config
 P: Retrieving exim4
 P: Validating exim4
-P: Retrieving libselinux1
-P: Validating libselinux1
 P: Retrieving logrotate
 P: Validating logrotate
 P: Retrieving pciutils
@@ -253,6 +251,8 @@ P: Retrieving base-files
 P: Validating base-files
 P: Retrieving libdb1-compat
 P: Validating libdb1-compat
+P: Retrieving mount
+P: Validating mount
 P: Retrieving bash
 P: Validating bash
 P: Retrieving findutils
@@ -289,11 +289,10 @@ P: Extracting bsdutils
 P: Extracting dpkg
 P: Extracting login
 P: Extracting passwd
-P: Extracting libblkid1
 P: Extracting libuuid1
-P: Extracting mount
 P: Extracting util-linux
 P: Extracting e2fslibs
+P: Extracting libblkid1
 P: Extracting libcomerr2
 P: Extracting libss2
 P: Extracting e2fsprogs
@@ -311,6 +310,7 @@ P: Extracting dselect
 P: Extracting diff
 P: Extracting base-files
 P: Extracting libdb1-compat
+P: Extracting mount
 P: Extracting bash
 P: Extracting findutils
 P: Unpacking package base-passwd
@@ -347,11 +347,10 @@ P: Unpacking package sed
 P: Unpacking package bsdutils
 P: Unpacking package login
 P: Unpacking package passwd
-P: Unpacking package libblkid1
 P: Unpacking package libuuid1
-P: Unpacking package mount
 P: Unpacking package util-linux
 P: Unpacking package e2fslibs
+P: Unpacking package libblkid1
 P: Unpacking package libcomerr2
 P: Unpacking package libss2
 P: Unpacking package e2fsprogs
@@ -369,6 +368,7 @@ P: Unpacking package dselect
 P: Unpacking package diff
 P: Unpacking package base-files
 P: Unpacking package libdb1-compat
+P: Unpacking package mount
 P: Unpacking package bash
 P: Unpacking package findutils
 P: Configuring package makedev
@@ -449,6 +449,7 @@ P: Unpacking package gettext-base
 P: Unpacking package base-config
 P: Unpacking package bsdmainutils
 P: Unpacking package cpio
+P: Unpacking package libselinux1
 P: Unpacking package cron
 P: Unpacking package dmidecode
 P: Unpacking package ed
@@ -467,13 +468,12 @@ P: Unpacking package libgdbm3
 P: Unpacking package liblzo1
 P: Unpacking package libopencdk8
 P: Unpacking package libtasn1-2
-P: Unpacking package libgnutls11
+P: Unpacking package libgnutls12
 P: Unpacking package libncursesw5
 P: Unpacking package libpcre3
 P: Unpacking package libpopt0
 P: Unpacking package libssl0.9.7
 P: Unpacking package libwrap0
-P: Unpacking package libselinux1
 P: Unpacking package logrotate
 P: Unpacking package man-db
 P: Unpacking package manpages
@@ -511,6 +511,7 @@ P: Configuring package aptitude
 P: Configuring package gettext-base
 P: Configuring package bsdmainutils
 P: Configuring package cpio
+P: Configuring package libselinux1
 P: Configuring package cron
 P: Configuring package dmidecode
 P: Configuring package ed
@@ -527,13 +528,12 @@ P: Configuring package libgdbm3
 P: Configuring package liblzo1
 P: Configuring package libopencdk8
 P: Configuring package libtasn1-2
-P: Configuring package libgnutls11
+P: Configuring package libgnutls12
 P: Configuring package libncursesw5
 P: Configuring package libpcre3
 P: Configuring package libpopt0
 P: Configuring package libssl0.9.7
 P: Configuring package libwrap0
-P: Configuring package libselinux1
 P: Configuring package logrotate
 P: Configuring package man-db
 P: Configuring package manpages
@@ -581,8 +581,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 [34.1kB]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [3758kB]
-Fetched 3792kB in 2s (1471kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [3789kB]
+Fetched 3823kB in 2s (1418kB/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
@@ -598,9 +598,9 @@ The following extra packages will be installed:
   linux-kernel-headers make patch perl perl-modules
 Suggested packages:
   binutils-doc cpp-doc gcc-4.0-locales gnupg debian-keyring gcc-4.0-doc
-  manpages-dev autoconf automake1.9 libtool flex bison gdb gcc-doc
-  amd64-libs-dev glibc-doc libstdc++6-4.0-doc stl-manual
-  libterm-readline-gnu-perl libterm-readline-perl-perl
+  lib64stdc++6 manpages-dev autoconf automake1.9 libtool flex bison gdb gcc-doc
+  libc6-dev-amd64 amd64-libs-dev lib64gcc1 glibc-doc libstdc++6-4.0-doc
+  stl-manual libterm-readline-gnu-perl libterm-readline-perl-perl
 Recommended packages:
   bzip2 libmudflap0-dev perl-doc
 The following NEW packages will be installed:
@@ -612,29 +612,29 @@ Need to get 19.4MB of archives.
 After unpacking 70.9MB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   binutils cpp-4.0 cpp perl-modules 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
+  libstdc++6-4.0-dev g++-4.0 g++ linux-kernel-headers libc6-dev build-essential
 Get:1 http://ftp.jp.debian.org sid/main binutils 2.16.1-2 [2378kB]
-Get:2 http://ftp.jp.debian.org sid/main cpp-4.0 4.0.1-4 [2041kB]
+Get:2 http://ftp.jp.debian.org sid/main cpp-4.0 4.0.1-6 [2042kB]
 Get:3 http://ftp.jp.debian.org sid/main cpp 4:4.0.1-3 [30.6kB]
 Get:4 http://ftp.jp.debian.org sid/main perl-modules 5.8.7-4 [2326kB]
 Get:5 http://ftp.jp.debian.org sid/main perl 5.8.7-4 [3378kB]
 Get:6 http://ftp.jp.debian.org sid/main patch 2.5.9-2 [96.4kB]
 Get:7 http://ftp.jp.debian.org sid/main make 3.80-11 [367kB]
-Get:8 http://ftp.jp.debian.org sid/main dpkg-dev 1.13.10 [163kB]
-Get:9 http://ftp.jp.debian.org sid/main gcc-4.0 4.0.1-4 [502kB]
+Get:8 http://ftp.jp.debian.org sid/main dpkg-dev 1.13.11 [163kB]
+Get:9 http://ftp.jp.debian.org sid/main gcc-4.0 4.0.1-6 [504kB]
 Get:10 http://ftp.jp.debian.org sid/main gcc 4:4.0.1-3 [4918B]
-Get:11 http://ftp.jp.debian.org sid/main linux-kernel-headers 2.6.13+0rc3-1.1 [1544kB]
-Get:12 http://ftp.jp.debian.org sid/main libc6-dev 2.3.5-3 [2678kB]
-Get:13 http://ftp.jp.debian.org sid/main libstdc++6-4.0-dev 4.0.1-4 [1517kB]
-Get:14 http://ftp.jp.debian.org sid/main g++-4.0 4.0.1-4 [2325kB]
-Get:15 http://ftp.jp.debian.org sid/main g++ 4:4.0.1-3 [1384B]
+Get:11 http://ftp.jp.debian.org sid/main libstdc++6-4.0-dev 4.0.1-6 [1517kB]
+Get:12 http://ftp.jp.debian.org sid/main g++-4.0 4.0.1-6 [2326kB]
+Get:13 http://ftp.jp.debian.org sid/main g++ 4:4.0.1-3 [1384B]
+Get:14 http://ftp.jp.debian.org sid/main linux-kernel-headers 2.6.13+0rc3-1.1 [1544kB]
+Get:15 http://ftp.jp.debian.org sid/main libc6-dev 2.3.5-4 [2679kB]
 Get:16 http://ftp.jp.debian.org sid/main build-essential 11.1 [6834B]
-Fetched 19.4MB in 9s (2006kB/s)
+Fetched 19.4MB in 12s (1598kB/s)
 Selecting previously deselected package binutils.
-(Reading database ... 7662 files and directories currently installed.)
+(Reading database ... 7660 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.16.1-2_i386.deb) ...
 Selecting previously deselected package cpp-4.0.
-Unpacking cpp-4.0 (from .../cpp-4.0_4.0.1-4_i386.deb) ...
+Unpacking cpp-4.0 (from .../cpp-4.0_4.0.1-6_i386.deb) ...
 Selecting previously deselected package cpp.
 Unpacking cpp (from .../cpp_4%3a4.0.1-3_i386.deb) ...
 Selecting previously deselected package perl-modules.
@@ -646,46 +646,46 @@ Unpacking patch (from .../patch_2.5.9-2_i386.deb) ...
 Selecting previously deselected package make.
 Unpacking make (from .../archives/make_3.80-11_i386.deb) ...
 Selecting previously deselected package dpkg-dev.
-Unpacking dpkg-dev (from .../dpkg-dev_1.13.10_all.deb) ...
+Unpacking dpkg-dev (from .../dpkg-dev_1.13.11_all.deb) ...
 Selecting previously deselected package gcc-4.0.
-Unpacking gcc-4.0 (from .../gcc-4.0_4.0.1-4_i386.deb) ...
+Unpacking gcc-4.0 (from .../gcc-4.0_4.0.1-6_i386.deb) ...
 Selecting previously deselected package gcc.
 Unpacking gcc (from .../gcc_4%3a4.0.1-3_i386.deb) ...
-Selecting previously deselected package linux-kernel-headers.
-Unpacking linux-kernel-headers (from .../linux-kernel-headers_2.6.13+0rc3-1.1_i386.deb) ...
-Selecting previously deselected package libc6-dev.
-Unpacking libc6-dev (from .../libc6-dev_2.3.5-3_i386.deb) ...
 Selecting previously deselected package libstdc++6-4.0-dev.
-Unpacking libstdc++6-4.0-dev (from .../libstdc++6-4.0-dev_4.0.1-4_i386.deb) ...
+Unpacking libstdc++6-4.0-dev (from .../libstdc++6-4.0-dev_4.0.1-6_i386.deb) ...
 Selecting previously deselected package g++-4.0.
-Unpacking g++-4.0 (from .../g++-4.0_4.0.1-4_i386.deb) ...
+Unpacking g++-4.0 (from .../g++-4.0_4.0.1-6_i386.deb) ...
 Selecting previously deselected package g++.
 Unpacking g++ (from .../g++_4%3a4.0.1-3_i386.deb) ...
+Selecting previously deselected package linux-kernel-headers.
+Unpacking linux-kernel-headers (from .../linux-kernel-headers_2.6.13+0rc3-1.1_i386.deb) ...
+Selecting previously deselected package libc6-dev.
+Unpacking libc6-dev (from .../libc6-dev_2.3.5-4_i386.deb) ...
 Selecting previously deselected package build-essential.
 Unpacking build-essential (from .../build-essential_11.1_i386.deb) ...
 Setting up binutils (2.16.1-2) ...
 
-Setting up cpp-4.0 (4.0.1-4) ...
+Setting up cpp-4.0 (4.0.1-6) ...
 Setting up cpp (4.0.1-3) ...
 Setting up patch (2.5.9-2) ...
 Setting up make (3.80-11) ...
 
-Setting up gcc-4.0 (4.0.1-4) ...
+Setting up gcc-4.0 (4.0.1-6) ...
 Setting up gcc (4.0.1-3) ...
 
 Setting up linux-kernel-headers (2.6.13+0rc3-1.1) ...
-Setting up libc6-dev (2.3.5-3) ...
+Setting up libc6-dev (2.3.5-4) ...
+Setting up libstdc++6-4.0-dev (4.0.1-6) ...
 Setting up perl-modules (5.8.7-4) ...
-Setting up libstdc++6-4.0-dev (4.0.1-4) ...
-Setting up perl (5.8.7-4) ...
-
-Setting up dpkg-dev (1.13.10) ...
-Setting up g++-4.0 (4.0.1-4) ...
+Setting up g++-4.0 (4.0.1-6) ...
 Setting up g++ (4.0.1-3) ...
 
+Setting up perl (5.8.7-4) ...
+
+Setting up dpkg-dev (1.13.11) ...
 Setting up build-essential (11.1) ...
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//13006 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//12185 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-etch.log b/testsuite/cdebootstrap/pbuilder-execute-etch.log
index 506a133..375e6bf 100644
--- a/testsuite/cdebootstrap/pbuilder-execute-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-execute-etch.log
@@ -1,5 +1,5 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -10,4 +10,4 @@ Building the build Environment
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//22061 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//26087 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-sarge.log b/testsuite/cdebootstrap/pbuilder-execute-sarge.log
index c9524f9..04112f6 100644
--- a/testsuite/cdebootstrap/pbuilder-execute-sarge.log
+++ b/testsuite/cdebootstrap/pbuilder-execute-sarge.log
@@ -1,5 +1,5 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -10,4 +10,4 @@ Building the build Environment
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//14176 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//16816 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-sid.log b/testsuite/cdebootstrap/pbuilder-execute-sid.log
index ab3104f..4ee600a 100644
--- a/testsuite/cdebootstrap/pbuilder-execute-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-execute-sid.log
@@ -1,5 +1,5 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -10,4 +10,4 @@ Building the build Environment
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//12433 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//14247 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
index 8daa8a1..f15294f 100644
--- a/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
+++ b/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
@@ -1,6 +1,6 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -17,8 +17,8 @@ Ign http://ftp.jp.debian.org sid Release
 Get:4 http://ftp.jp.debian.org ../project/experimental Release [21.6kB]
 Ign http://ftp.jp.debian.org ../project/experimental Release
 Hit http://ftp.jp.debian.org sid/main Packages
-Get:5 http://ftp.jp.debian.org ../project/experimental/main Packages [163kB]
-Fetched 219kB in 0s (411kB/s)
+Get:5 http://ftp.jp.debian.org ../project/experimental/main Packages [159kB]
+Fetched 215kB in 0s (306kB/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: GPG error: http://ftp.jp.debian.org ../project/experimental Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
@@ -29,37 +29,42 @@ Building dependency tree...
 The following packages have been kept back:
   aptitude
 The following packages will be upgraded:
-  diff login makedev passwd
-4 upgraded, 0 newly installed, 0 to remove and 1 not upgraded.
-Need to get 1336kB of archives.
-After unpacking 627kB of additional disk space will be used.
+  adduser diff login makedev passwd
+5 upgraded, 0 newly installed, 0 to remove and 1 not upgraded.
+Need to get 1446kB of archives.
+After unpacking 623kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
-  diff login passwd makedev
+  diff login passwd adduser makedev
 Get:1 http://ftp.jp.debian.org ../project/experimental/main diff 2.8.7-0.2 [241kB]
 Get:2 http://ftp.jp.debian.org ../project/experimental/main login 1:4.0.11.1-1 [485kB]
 Get:3 http://ftp.jp.debian.org ../project/experimental/main passwd 1:4.0.11.1-1 [518kB]
-Get:4 http://ftp.jp.debian.org ../project/experimental/main makedev 3.3.8.2-0 [92.2kB]
+Get:4 http://ftp.jp.debian.org ../project/experimental/main adduser 3.68 [110kB]
+Get:5 http://ftp.jp.debian.org ../project/experimental/main makedev 3.3.8.2-0 [92.2kB]
 Preconfiguring packages ...
-Fetched 1336kB in 1s (1276kB/s)
-(Reading database ... 11472 files and directories currently installed.)
+Fetched 1446kB in 0s (1527kB/s)
+(Reading database ... 11484 files and directories currently installed.)
 Preparing to replace diff 2.8.1-11 (using .../diff_2.8.7-0.2_i386.deb) ...
 Unpacking replacement diff ...
 Setting up diff (2.8.7-0.2) ...
-(Reading database ... 11480 files and directories currently installed.)
+(Reading database ... 11492 files and directories currently installed.)
 Preparing to replace login 1:4.0.3-39 (using .../login_1%3a4.0.11.1-1_i386.deb) ...
 Unpacking replacement login ...
 Setting up login (4.0.11.1-1) ...
 Installing new version of config file /etc/pam.d/su ...
 Installing new version of config file /etc/login.defs ...
 
-(Reading database ... 11486 files and directories currently installed.)
+(Reading database ... 11498 files and directories currently installed.)
 Preparing to replace passwd 1:4.0.3-39 (using .../passwd_1%3a4.0.11.1-1_i386.deb) ...
 Unpacking replacement passwd ...
 Setting up passwd (4.0.11.1-1) ...
 
-(Reading database ... 11499 files and directories currently installed.)
+(Reading database ... 11511 files and directories currently installed.)
+Preparing to replace adduser 3.67 (using .../archives/adduser_3.68_all.deb) ...
+Unpacking replacement adduser ...
 Preparing to replace makedev 2.3.1-78 (using .../makedev_3.3.8.2-0_i386.deb) ...
 Unpacking replacement makedev ...
+Setting up adduser (3.68) ...
+
 Setting up makedev (3.3.8.2-0) ...
 Reading package lists...
 Building dependency tree...
@@ -69,6 +74,6 @@ apt is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded.
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//23338 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//27782 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
index a55af5d..752ee78 100644
--- a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
@@ -1,6 +1,6 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -9,9 +9,9 @@ Building the build Environment
   -> Installing apt-lines
 Refreshing the base.tgz 
  -> upgrading packages
-Get:1 http://ftp.jp.debian.org sid/main Packages [3758kB]
+Get:1 http://ftp.jp.debian.org sid/main Packages [3789kB]
 Get:2 http://ftp.jp.debian.org sid/main Release [82B]
-Fetched 3758kB in 2s (1437kB/s)
+Fetched 3789kB in 2s (1463kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading Package Lists...
@@ -19,119 +19,146 @@ Building Dependency Tree...
 The following packages will be REMOVED:
   libsigc++-1.2-5c102
 The following NEW packages will be installed:
-  libncursesw5 libselinux1 libsigc++-1.2-5c2 lsb-base
+  libgnutls12 libncursesw5 libselinux1 libsigc++-1.2-5c2
 The following packages will be upgraded:
-  adduser apt apt-utils aptitude bsdutils console-common cpio cpp-4.0 debconf
-  debconf-i18n debianutils dhcp3-client dhcp3-common dmidecode e2fslibs
-  e2fsprogs g++-4.0 gcc-3.3-base gcc-4.0 gcc-4.0-base iptables libblkid1 libc6
-  libc6-dev libcomerr2 libdb1-compat libdb4.2 libgcc1 libnewt0.51
-  libpam-modules libpam-runtime libpam0g libslang2 libss2 libssl0.9.7
-  libstdc++5 libstdc++6 libstdc++6-4.0-dev libuuid1 linux-kernel-headers login
-  logrotate make mount nano passwd perl perl-base perl-modules sed tar tasksel
-  telnet util-linux whiptail zlib1g
-56 upgraded, 4 newly installed, 1 to remove and 0 not upgraded.
-Need to get 35.5MB of archives.
-After unpacking 2457kB of additional disk space will be used.
-Get:1 http://ftp.jp.debian.org sid/main linux-kernel-headers 2.6.13+0rc3-1.1 [1544kB]
-Get:2 http://ftp.jp.debian.org sid/main libc6-dev 2.3.5-3 [2678kB]
-Get:3 http://ftp.jp.debian.org sid/main libc6 2.3.5-3 [4927kB]
-Get:4 http://ftp.jp.debian.org sid/main libdb4.2 4.2.52-19 [388kB]
-Get:5 http://ftp.jp.debian.org sid/main libgcc1 1:4.0.1-4 [89.9kB]
-Get:6 http://ftp.jp.debian.org sid/main gcc-4.0-base 4.0.1-4 [175kB]
-Get:7 http://ftp.jp.debian.org sid/main libstdc++6 4.0.1-4 [352kB]
-Get:8 http://ftp.jp.debian.org sid/main apt-utils 0.6.40.1 [199kB]
-Get:9 http://ftp.jp.debian.org sid/main libsigc++-1.2-5c2 1.2.5-5 [21.7kB]
-Get:10 http://ftp.jp.debian.org sid/main aptitude 0.2.15.9-6 [1027kB]
-Get:11 http://ftp.jp.debian.org sid/main apt 0.6.40.1 [1226kB]
-Get:12 http://ftp.jp.debian.org sid/main bsdutils 1:2.12p-5 [66.3kB]
-Get:13 http://ftp.jp.debian.org sid/main debianutils 2.14.2 [56.5kB]
-Get:14 http://ftp.jp.debian.org sid/main e2fslibs 1.38-1.1 [78.5kB]
-Get:15 http://ftp.jp.debian.org sid/main e2fsprogs 1.38-1.1 [522kB]
-Get:16 http://ftp.jp.debian.org sid/main libpam-runtime 0.76-23 [59.1kB]
-Get:17 http://ftp.jp.debian.org sid/main libpam0g 0.76-23 [74.3kB]
-Get:18 http://ftp.jp.debian.org sid/main libpam-modules 0.76-23 [147kB]
-Get:19 http://ftp.jp.debian.org sid/main login 1:4.0.3-39 [579kB]
-Get:20 http://ftp.jp.debian.org sid/main mount 2.12p-5 [140kB]
-Get:21 http://ftp.jp.debian.org sid/main perl-modules 5.8.7-4 [2326kB]
-Get:22 http://ftp.jp.debian.org sid/main perl 5.8.7-4 [3378kB]
-Get:23 http://ftp.jp.debian.org sid/main perl-base 5.8.7-4 [781kB]
-Get:24 http://ftp.jp.debian.org sid/main sed 4.1.4-2 [242kB]
-Get:25 http://ftp.jp.debian.org sid/main tar 1.15.1-2 [756kB]
-Get:26 http://ftp.jp.debian.org sid/main util-linux 2.12p-5 [382kB]
-Get:27 http://ftp.jp.debian.org sid/main lsb-base 3.0-5 [9834B]
-Get:28 http://ftp.jp.debian.org sid/main console-common 0.7.53 [116kB]
-Get:29 http://ftp.jp.debian.org sid/main debconf-i18n 1.4.57 [109kB]
-Get:30 http://ftp.jp.debian.org sid/main debconf 1.4.57 [110kB]
-Get:31 http://ftp.jp.debian.org sid/main libslang2 2.0.4-4 [406kB]
-Get:32 http://ftp.jp.debian.org sid/main libblkid1 1.38-1.1 [42.2kB]
-Get:33 http://ftp.jp.debian.org sid/main libcomerr2 1.38-1.1 [27.3kB]
-Get:34 http://ftp.jp.debian.org sid/main libss2 1.38-1.1 [33.2kB]
-Get:35 http://ftp.jp.debian.org sid/main gcc-3.3-base 1:3.3.6-8 [150kB]
-Get:36 http://ftp.jp.debian.org sid/main libstdc++5 1:3.3.6-8 [295kB]
-Get:37 http://ftp.jp.debian.org sid/main libuuid1 1.38-1.1 [32.1kB]
-Get:38 http://ftp.jp.debian.org sid/main passwd 1:4.0.3-39 [514kB]
-Get:39 http://ftp.jp.debian.org sid/main zlib1g 1:1.2.3-3 [69.0kB]
-Get:40 http://ftp.jp.debian.org sid/main adduser 3.67 [110kB]
-Get:41 http://ftp.jp.debian.org sid/main cpio 2.6-3 [119kB]
-Get:42 http://ftp.jp.debian.org sid/main dmidecode 2.6-2 [47.4kB]
-Get:43 http://ftp.jp.debian.org sid/main iptables 1.3.3-2 [390kB]
-Get:44 http://ftp.jp.debian.org sid/main libncursesw5 5.4-9 [307kB]
-Get:45 http://ftp.jp.debian.org sid/main libssl0.9.7 0.9.7g-1 [2215kB]
-Get:46 http://ftp.jp.debian.org sid/main libselinux1 1.24-4 [46.5kB]
-Get:47 http://ftp.jp.debian.org sid/main logrotate 3.7.1-1 [34.1kB]
-Get:48 http://ftp.jp.debian.org sid/main nano 1.3.8-2 [403kB]
-Get:49 http://ftp.jp.debian.org sid/main tasksel 2.30 [151kB]
-Get:50 http://ftp.jp.debian.org sid/main whiptail 0.51.6-29 [32.5kB]
-Get:51 http://ftp.jp.debian.org sid/main libnewt0.51 0.51.6-29 [59.4kB]
-Get:52 http://ftp.jp.debian.org sid/main libdb1-compat 2.1.3-8 [33.0kB]
-Get:53 http://ftp.jp.debian.org sid/main make 3.80-11 [367kB]
-Get:54 http://ftp.jp.debian.org sid/main telnet 0.17-30 [64.3kB]
-Get:55 http://ftp.jp.debian.org sid/main gcc-4.0 4.0.1-4 [502kB]
-Get:56 http://ftp.jp.debian.org sid/main libstdc++6-4.0-dev 4.0.1-4 [1517kB]
-Get:57 http://ftp.jp.debian.org sid/main g++-4.0 4.0.1-4 [2325kB]
-Get:58 http://ftp.jp.debian.org sid/main cpp-4.0 4.0.1-4 [2041kB]
-Get:59 http://ftp.jp.debian.org sid/main dhcp3-client 3.0.2-3 [420kB]
-Get:60 http://ftp.jp.debian.org sid/main dhcp3-common 3.0.2-3 [176kB]
+  apt apt-utils aptitude base-config bsdutils cpio cpp-4.0 cron debianutils
+  dmidecode dpkg dpkg-dev dselect e2fslibs e2fsprogs exim4 exim4-base
+  exim4-config exim4-daemon-light g++-4.0 gcc-3.3-base gcc-4.0 gcc-4.0-base
+  hostname initscripts iptables libblkid1 libc6 libc6-dev libcomerr2
+  libdb1-compat libdb4.2 libgcc1 libnewt0.51 libpam-modules libpam-runtime
+  libpam0g libslang2 libss2 libssl0.9.7 libstdc++5 libstdc++6
+  libstdc++6-4.0-dev libuuid1 login logrotate lsb-base make mount nano passwd
+  perl perl-base perl-modules sed sysv-rc sysvinit tar telnet util-linux wget
+  whiptail zlib1g
+63 upgraded, 4 newly installed, 1 to remove and 0 not upgraded.
+Need to get 37.8MB of archives.
+After unpacking 2961kB of additional disk space will be used.
+Get:1 http://ftp.jp.debian.org sid/main libc6-dev 2.3.5-4 [2679kB]
+Get:2 http://ftp.jp.debian.org sid/main libc6 2.3.5-4 [4927kB]
+Get:3 http://ftp.jp.debian.org sid/main libdb4.2 4.2.52-19 [388kB]
+Get:4 http://ftp.jp.debian.org sid/main libgcc1 1:4.0.1-6 [90.5kB]
+Get:5 http://ftp.jp.debian.org sid/main gcc-4.0-base 4.0.1-6 [175kB]
+Get:6 http://ftp.jp.debian.org sid/main libstdc++6 4.0.1-6 [353kB]
+Get:7 http://ftp.jp.debian.org sid/main apt-utils 0.6.40.1 [199kB]
+Get:8 http://ftp.jp.debian.org sid/main libsigc++-1.2-5c2 1.2.5-5 [21.7kB]
+Get:9 http://ftp.jp.debian.org sid/main aptitude 0.2.15.9-6 [1027kB]
+Get:10 http://ftp.jp.debian.org sid/main apt 0.6.40.1 [1226kB]
+Get:11 http://ftp.jp.debian.org sid/main bsdutils 1:2.12p-7 [66.1kB]
+Get:12 http://ftp.jp.debian.org sid/main debianutils 2.14.2 [56.5kB]
+Get:13 http://ftp.jp.debian.org sid/main dpkg 1.13.11 [1821kB]
+Get:14 http://ftp.jp.debian.org sid/main e2fslibs 1.38-2 [78.9kB]
+Get:15 http://ftp.jp.debian.org sid/main e2fsprogs 1.38-2 [526kB]
+Get:16 http://ftp.jp.debian.org sid/main hostname 2.90 [9556B]
+Get:17 http://ftp.jp.debian.org sid/main libpam-runtime 0.76-23 [59.1kB]
+Get:18 http://ftp.jp.debian.org sid/main libpam0g 0.76-23 [74.3kB]
+Get:19 http://ftp.jp.debian.org sid/main libpam-modules 0.76-23 [147kB]
+Get:20 http://ftp.jp.debian.org sid/main login 1:4.0.3-39 [579kB]
+Get:21 http://ftp.jp.debian.org sid/main mount 2.12p-7 [140kB]
+Get:22 http://ftp.jp.debian.org sid/main perl-modules 5.8.7-4 [2326kB]
+Get:23 http://ftp.jp.debian.org sid/main perl 5.8.7-4 [3378kB]
+Get:24 http://ftp.jp.debian.org sid/main perl-base 5.8.7-4 [781kB]
+Get:25 http://ftp.jp.debian.org sid/main sed 4.1.4-2 [242kB]
+Get:26 http://ftp.jp.debian.org sid/main sysvinit 2.86.ds1-1.1 [96.5kB]
+Get:27 http://ftp.jp.debian.org sid/main tar 1.15.1-2 [756kB]
+Get:28 http://ftp.jp.debian.org sid/main util-linux 2.12p-7 [369kB]
+Get:29 http://ftp.jp.debian.org sid/main libslang2 2.0.4-4 [406kB]
+Get:30 http://ftp.jp.debian.org sid/main initscripts 2.86.ds1-1.1 [32.0kB]
+Get:31 http://ftp.jp.debian.org sid/main libblkid1 1.38-2 [43.6kB]
+Get:32 http://ftp.jp.debian.org sid/main libcomerr2 1.38-2 [27.7kB]
+Get:33 http://ftp.jp.debian.org sid/main libss2 1.38-2 [33.6kB]
+Get:34 http://ftp.jp.debian.org sid/main gcc-3.3-base 1:3.3.6-9 [150kB]
+Get:35 http://ftp.jp.debian.org sid/main libstdc++5 1:3.3.6-9 [295kB]
+Get:36 http://ftp.jp.debian.org sid/main libuuid1 1.38-2 [33.1kB]
+Get:37 http://ftp.jp.debian.org sid/main libselinux1 1.24-4 [46.5kB]
+Get:38 http://ftp.jp.debian.org sid/main cron 3.0pl1-91 [60.0kB]
+Get:39 http://ftp.jp.debian.org sid/main exim4-config 4.52-2 [246kB]
+Get:40 http://ftp.jp.debian.org sid/main exim4-base 4.52-2 [842kB]
+Get:41 http://ftp.jp.debian.org sid/main passwd 1:4.0.3-39 [514kB]
+Get:42 http://ftp.jp.debian.org sid/main sysv-rc 2.86.ds1-1.1 [36.2kB]
+Get:43 http://ftp.jp.debian.org sid/main zlib1g 1:1.2.3-3 [69.0kB]
+Get:44 http://ftp.jp.debian.org sid/main base-config 2.71 [260kB]
+Get:45 http://ftp.jp.debian.org sid/main cpio 2.6-3 [119kB]
+Get:46 http://ftp.jp.debian.org sid/main dmidecode 2.7-2 [50.8kB]
+Get:47 http://ftp.jp.debian.org sid/main iptables 1.3.3-2 [390kB]
+Get:48 http://ftp.jp.debian.org sid/main libgnutls12 1.2.6-1 [349kB]
+Get:49 http://ftp.jp.debian.org sid/main libncursesw5 5.4-9 [307kB]
+Get:50 http://ftp.jp.debian.org sid/main libssl0.9.7 0.9.7g-1 [2215kB]
+Get:51 http://ftp.jp.debian.org sid/main logrotate 3.7.1-1 [34.1kB]
+Get:52 http://ftp.jp.debian.org sid/main lsb-base 3.0-5 [9834B]
+Get:53 http://ftp.jp.debian.org sid/main nano 1.3.8-2 [403kB]
+Get:54 http://ftp.jp.debian.org sid/main wget 1.10.1-1 [609kB]
+Get:55 http://ftp.jp.debian.org sid/main whiptail 0.51.6-30 [32.5kB]
+Get:56 http://ftp.jp.debian.org sid/main libnewt0.51 0.51.6-30 [59.6kB]
+Get:57 http://ftp.jp.debian.org sid/main dselect 1.13.11 [120kB]
+Get:58 http://ftp.jp.debian.org sid/main libdb1-compat 2.1.3-8 [33.0kB]
+Get:59 http://ftp.jp.debian.org sid/main make 3.80-11 [367kB]
+Get:60 http://ftp.jp.debian.org sid/main dpkg-dev 1.13.11 [163kB]
+Get:61 http://ftp.jp.debian.org sid/main exim4-daemon-light 4.52-2 [375kB]
+Get:62 http://ftp.jp.debian.org sid/main exim4 4.52-2 [1132B]
+Get:63 http://ftp.jp.debian.org sid/main telnet 0.17-30 [64.3kB]
+Get:64 http://ftp.jp.debian.org sid/main cpp-4.0 4.0.1-6 [2042kB]
+Get:65 http://ftp.jp.debian.org sid/main gcc-4.0 4.0.1-6 [504kB]
+Get:66 http://ftp.jp.debian.org sid/main libstdc++6-4.0-dev 4.0.1-6 [1517kB]
+Get:67 http://ftp.jp.debian.org sid/main g++-4.0 4.0.1-6 [2326kB]
 Preconfiguring packages ...
-Fetched 35.5MB in 18s (1868kB/s)
-(Reading database ... 11328 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-1.1_i386.deb) ...
-Unpacking replacement linux-kernel-headers ...
-Preparing to replace libc6-dev 2.3.2.ds1-22 (using .../libc6-dev_2.3.5-3_i386.deb) ...
+Fetched 37.8MB in 19s (1897kB/s)
+(Reading database ... 11409 files and directories currently installed.)
+Preparing to replace libc6-dev 2.3.2.ds1-22 (using .../libc6-dev_2.3.5-4_i386.deb) ...
 Unpacking replacement libc6-dev ...
-Preparing to replace libc6 2.3.2.ds1-22 (using .../libc6_2.3.5-3_i386.deb) ...
+Preparing to replace libc6 2.3.2.ds1-22 (using .../libc6_2.3.5-4_i386.deb) ...
+
+Name Service Switch update in the C Library: pre-installation question.
+
+Running services and programs that are using NSS need to be restarted,
+otherwise they might not be able to do lookup or authentication any more.
+The installation process is able to restart some services (such as ssh or
+telnetd), but other programs cannot be restarted automatically.  One such
+program that needs manual stopping and restart after the glibc upgrade by
+yourself is xdm - because automatic restart might disconnect your active
+X11 sessions.
+
+Known packages that need to be stopped before the glibc upgrade are:
+        xdm kdm gdm postgresql xscreensaver
+This script does not detect any services to stop now.
+
+If you want to interrupt the upgrade now and continue later, please
+answer No to the question below.
+
+Non-interactive mode, upgrade glibc forcibly
+
 Unpacking replacement libc6 ...
-Setting up libc6 (2.3.5-3) ...
+Setting up libc6 (2.3.5-4) ...
+Checking for services that may need to be restarted...done.
 Current default timezone: 'UTC'.
-Local time is now:      Tue Aug 16 23:14:26 UTC 2005.
-Universal Time is now:  Tue Aug 16 23:14:26 UTC 2005.
+Local time is now:      Thu Aug 25 01:11:40 UTC 2005.
+Universal Time is now:  Thu Aug 25 01:11:40 UTC 2005.
 Run 'tzconfig' if you wish to change it.
 
-(Reading database ... 11434 files and directories currently installed.)
+(Reading database ... 11443 files and directories currently installed.)
 Preparing to replace libdb4.2 4.2.52-18 (using .../libdb4.2_4.2.52-19_i386.deb) ...
 Unpacking replacement libdb4.2 ...
-Preparing to replace libgcc1 1:4.0.1-2 (using .../libgcc1_1%3a4.0.1-4_i386.deb) ...
+Preparing to replace libgcc1 1:4.0.1-2 (using .../libgcc1_1%3a4.0.1-6_i386.deb) ...
 Unpacking replacement libgcc1 ...
-Setting up libgcc1 (4.0.1-4) ...
+Setting up libgcc1 (4.0.1-6) ...
 
-(Reading database ... 11434 files and directories currently installed.)
-Preparing to replace gcc-4.0-base 4.0.1-2 (using .../gcc-4.0-base_4.0.1-4_i386.deb) ...
+(Reading database ... 11443 files and directories currently installed.)
+Preparing to replace gcc-4.0-base 4.0.1-2 (using .../gcc-4.0-base_4.0.1-6_i386.deb) ...
 Unpacking replacement gcc-4.0-base ...
-Preparing to replace libstdc++6 4.0.1-2 (using .../libstdc++6_4.0.1-4_i386.deb) ...
+Preparing to replace libstdc++6 4.0.1-2 (using .../libstdc++6_4.0.1-6_i386.deb) ...
 Unpacking replacement libstdc++6 ...
-Setting up gcc-4.0-base (4.0.1-4) ...
-Setting up libstdc++6 (4.0.1-4) ...
+Setting up gcc-4.0-base (4.0.1-6) ...
+Setting up libstdc++6 (4.0.1-6) ...
 
-(Reading database ... 11434 files and directories currently installed.)
+(Reading database ... 11443 files and directories currently installed.)
 Preparing to replace apt-utils 0.5.28.6 (using .../apt-utils_0.6.40.1_i386.deb) ...
 Unpacking replacement apt-utils ...
 dpkg: libsigc++-1.2-5c102: dependency problems, but removing anyway as you request:
  aptitude depends on libsigc++-1.2-5c102; however:
   Package libsigc++-1.2-5c102 is to be removed.
-(Reading database ... 11434 files and directories currently installed.)
+(Reading database ... 11443 files and directories currently installed.)
 Removing libsigc++-1.2-5c102 ...
 Selecting previously deselected package libsigc++-1.2-5c2.
-(Reading database ... 11428 files and directories currently installed.)
+(Reading database ... 11437 files and directories currently installed.)
 Unpacking libsigc++-1.2-5c2 (from .../libsigc++-1.2-5c2_1.2.5-5_i386.deb) ...
 Preparing to replace aptitude 0.2.15.9-2 (using .../aptitude_0.2.15.9-6_i386.deb) ...
 Unpacking replacement aptitude ...
@@ -139,54 +166,63 @@ Preparing to replace apt 0.5.28.6 (using .../archives/apt_0.6.40.1_i386.deb) ...
 Unpacking replacement apt ...
 Setting up apt (0.6.40.1) ...
 
-(Reading database ... 11401 files and directories currently installed.)
-Preparing to replace bsdutils 1:2.12p-4 (using .../bsdutils_1%3a2.12p-5_i386.deb) ...
+(Reading database ... 11410 files and directories currently installed.)
+Preparing to replace bsdutils 1:2.12p-4 (using .../bsdutils_1%3a2.12p-7_i386.deb) ...
 Unpacking replacement bsdutils ...
-Setting up bsdutils (2.12p-5) ...
+Setting up bsdutils (2.12p-7) ...
 
-(Reading database ... 11401 files and directories currently installed.)
+(Reading database ... 11410 files and directories currently installed.)
 Preparing to replace debianutils 2.14.1 (using .../debianutils_2.14.2_i386.deb) ...
 Unpacking replacement debianutils ...
 Setting up debianutils (2.14.2) ...
 
-(Reading database ... 11410 files and directories currently installed.)
-Preparing to replace e2fslibs 1.37-2sarge1 (using .../e2fslibs_1.38-1.1_i386.deb) ...
+(Reading database ... 11419 files and directories currently installed.)
+Preparing to replace dpkg 1.13.10 (using .../archives/dpkg_1.13.11_i386.deb) ...
+Unpacking replacement dpkg ...
+Setting up dpkg (1.13.11) ...
+
+(Reading database ... 11419 files and directories currently installed.)
+Preparing to replace e2fslibs 1.37-2sarge1 (using .../e2fslibs_1.38-2_i386.deb) ...
 Unpacking replacement e2fslibs ...
-Setting up e2fslibs (1.38-1.1) ...
+Setting up e2fslibs (1.38-2) ...
 
-(Reading database ... 11410 files and directories currently installed.)
-Preparing to replace e2fsprogs 1.37-2sarge1 (using .../e2fsprogs_1.38-1.1_i386.deb) ...
+(Reading database ... 11419 files and directories currently installed.)
+Preparing to replace e2fsprogs 1.37-2sarge1 (using .../e2fsprogs_1.38-2_i386.deb) ...
 Unpacking replacement e2fsprogs ...
-Setting up e2fsprogs (1.38-1.1) ...
-(Reading database ... 11412 files and directories currently installed.)
+Setting up e2fsprogs (1.38-2) ...
+(Reading database ... 11421 files and directories currently installed.)
+Preparing to replace hostname 2.13 (using .../hostname_2.90_i386.deb) ...
+Unpacking replacement hostname ...
+Setting up hostname (2.90) ...
+(Reading database ... 11421 files and directories currently installed.)
 Preparing to replace libpam-runtime 0.76-22 (using .../libpam-runtime_0.76-23_all.deb) ...
 Unpacking replacement libpam-runtime ...
 Setting up libpam-runtime (0.76-23) ...
 Installing new version of config file /etc/pam.conf ...
 
-(Reading database ... 11412 files and directories currently installed.)
+(Reading database ... 11421 files and directories currently installed.)
 Preparing to replace libpam0g 0.76-22 (using .../libpam0g_0.76-23_i386.deb) ...
 Unpacking replacement libpam0g ...
 Setting up libpam0g (0.76-23) ...
 
-(Reading database ... 11412 files and directories currently installed.)
+(Reading database ... 11421 files and directories currently installed.)
 Preparing to replace libpam-modules 0.76-22 (using .../libpam-modules_0.76-23_i386.deb) ...
 Unpacking replacement libpam-modules ...
 Setting up libpam-modules (0.76-23) ...
 Installing new version of config file /etc/security/pam_env.conf ...
 
-(Reading database ... 11412 files and directories currently installed.)
+(Reading database ... 11421 files and directories currently installed.)
 Preparing to replace login 1:4.0.3-35 (using .../login_1%3a4.0.3-39_i386.deb) ...
 Unpacking replacement login ...
 Setting up login (4.0.3-39) ...
 Installing new version of config file /etc/login.defs ...
 
-(Reading database ... 11411 files and directories currently installed.)
-Preparing to replace mount 2.12p-4 (using .../mount_2.12p-5_i386.deb) ...
+(Reading database ... 11420 files and directories currently installed.)
+Preparing to replace mount 2.12p-4 (using .../mount_2.12p-7_i386.deb) ...
 Unpacking replacement mount ...
-Setting up mount (2.12p-5) ...
+Setting up mount (2.12p-7) ...
 
-(Reading database ... 11411 files and directories currently installed.)
+(Reading database ... 11420 files and directories currently installed.)
 Preparing to replace perl-modules 5.8.7-3 (using .../perl-modules_5.8.7-4_all.deb) ...
 Unpacking replacement perl-modules ...
 Preparing to replace perl 5.8.7-3 (using .../archives/perl_5.8.7-4_i386.deb) ...
@@ -194,117 +230,144 @@ Unpacking replacement perl ...
 Preparing to replace perl-base 5.8.7-3 (using .../perl-base_5.8.7-4_i386.deb) ...
 Unpacking replacement perl-base ...
 Setting up perl-base (5.8.7-4) ...
-(Reading database ... 11426 files and directories currently installed.)
+(Reading database ... 11435 files and directories currently installed.)
 Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-2_i386.deb) ...
 Unpacking replacement sed ...
 Setting up sed (4.1.4-2) ...
 
-(Reading database ... 11427 files and directories currently installed.)
+(Reading database ... 11436 files and directories currently installed.)
+Preparing to replace sysvinit 2.86.ds1-1 (using .../sysvinit_2.86.ds1-1.1_i386.deb) ...
+Unpacking replacement sysvinit ...
+Setting up sysvinit (2.86.ds1-1.1) ...
+init: timeout opening/writing control channel /dev/initctl
+
+(Reading database ... 11436 files and directories currently installed.)
 Preparing to replace tar 1.14-2 (using .../archives/tar_1.15.1-2_i386.deb) ...
 Unpacking replacement tar ...
 Setting up tar (1.15.1-2) ...
 
-(Reading database ... 11431 files and directories currently installed.)
-Preparing to replace util-linux 2.12p-4 (using .../util-linux_2.12p-5_i386.deb) ...
+(Reading database ... 11440 files and directories currently installed.)
+Preparing to replace util-linux 2.12p-4 (using .../util-linux_2.12p-7_i386.deb) ...
 Unpacking replacement util-linux ...
-Setting up util-linux (2.12p-5) ...
-
-Selecting previously deselected package lsb-base.
-(Reading database ... 11431 files and directories currently installed.)
-Unpacking lsb-base (from .../lsb-base_3.0-5_all.deb) ...
-Preparing to replace console-common 0.7.52 (using .../console-common_0.7.53_all.deb) ...
-Unpacking replacement console-common ...
-Preparing to replace debconf-i18n 1.4.52 (using .../debconf-i18n_1.4.57_all.deb) ...
-Unpacking replacement debconf-i18n ...
-Preparing to replace debconf 1.4.52 (using .../debconf_1.4.57_all.deb) ...
-Unpacking replacement debconf ...
+Setting up util-linux (2.12p-7) ...
+Installing new version of config file /etc/init.d/hwclock.sh ...
+Installing new version of config file /etc/init.d/hwclockfirst.sh ...
+
+(Reading database ... 11440 files and directories currently installed.)
 Preparing to replace libslang2 2.0.4-2 (using .../libslang2_2.0.4-4_i386.deb) ...
 Unpacking replacement libslang2 ...
 Setting up libslang2 (2.0.4-4) ...
 
-(Reading database ... 11437 files and directories currently installed.)
-Preparing to replace libblkid1 1.37-2sarge1 (using .../libblkid1_1.38-1.1_i386.deb) ...
+(Reading database ... 11440 files and directories currently installed.)
+Preparing to replace initscripts 2.86.ds1-1 (using .../initscripts_2.86.ds1-1.1_i386.deb) ...
+Unpacking replacement initscripts ...
+Setting up initscripts (2.86.ds1-1.1) ...
+Installing new version of config file /etc/init.d/bootclean.sh ...
+Installing new version of config file /etc/init.d/checkroot.sh ...
+Installing new version of config file /etc/init.d/mountnfs.sh ...
+Installing new version of config file /etc/default/tmpfs ...
+
+(Reading database ... 11440 files and directories currently installed.)
+Preparing to replace libblkid1 1.37-2sarge1 (using .../libblkid1_1.38-2_i386.deb) ...
 Unpacking replacement libblkid1 ...
-Setting up libblkid1 (1.38-1.1) ...
+Setting up libblkid1 (1.38-2) ...
 
-(Reading database ... 11437 files and directories currently installed.)
-Preparing to replace libcomerr2 1.37-2sarge1 (using .../libcomerr2_1.38-1.1_i386.deb) ...
+(Reading database ... 11440 files and directories currently installed.)
+Preparing to replace libcomerr2 1.37-2sarge1 (using .../libcomerr2_1.38-2_i386.deb) ...
 Unpacking replacement libcomerr2 ...
-Setting up libcomerr2 (1.38-1.1) ...
+Setting up libcomerr2 (1.38-2) ...
 
-(Reading database ... 11437 files and directories currently installed.)
-Preparing to replace libss2 1.37-2sarge1 (using .../libss2_1.38-1.1_i386.deb) ...
+(Reading database ... 11440 files and directories currently installed.)
+Preparing to replace libss2 1.37-2sarge1 (using .../libss2_1.38-2_i386.deb) ...
 Unpacking replacement libss2 ...
-Setting up libss2 (1.38-1.1) ...
+Setting up libss2 (1.38-2) ...
 
-(Reading database ... 11437 files and directories currently installed.)
-Preparing to replace gcc-3.3-base 1:3.3.6-7 (using .../gcc-3.3-base_1%3a3.3.6-8_i386.deb) ...
+(Reading database ... 11440 files and directories currently installed.)
+Preparing to replace gcc-3.3-base 1:3.3.6-7 (using .../gcc-3.3-base_1%3a3.3.6-9_i386.deb) ...
 Unpacking replacement gcc-3.3-base ...
-Preparing to replace libstdc++5 1:3.3.6-7 (using .../libstdc++5_1%3a3.3.6-8_i386.deb) ...
+Preparing to replace libstdc++5 1:3.3.6-7 (using .../libstdc++5_1%3a3.3.6-9_i386.deb) ...
 Unpacking replacement libstdc++5 ...
-Setting up gcc-3.3-base (3.3.6-8) ...
-Setting up libstdc++5 (3.3.6-8) ...
+Setting up gcc-3.3-base (3.3.6-9) ...
+Setting up libstdc++5 (3.3.6-9) ...
 
-(Reading database ... 11437 files and directories currently installed.)
-Preparing to replace libuuid1 1.37-2sarge1 (using .../libuuid1_1.38-1.1_i386.deb) ...
+(Reading database ... 11440 files and directories currently installed.)
+Preparing to replace libuuid1 1.37-2sarge1 (using .../libuuid1_1.38-2_i386.deb) ...
 Unpacking replacement libuuid1 ...
-Setting up libuuid1 (1.38-1.1) ...
+Setting up libuuid1 (1.38-2) ...
 
-(Reading database ... 11437 files and directories currently installed.)
+Selecting previously deselected package libselinux1.
+(Reading database ... 11440 files and directories currently installed.)
+Unpacking libselinux1 (from .../libselinux1_1.24-4_i386.deb) ...
+Preparing to replace cron 3.0pl1-87 (using .../cron_3.0pl1-91_i386.deb) ...
+Unpacking replacement cron ...
+Preparing to replace exim4-config 4.52-1 (using .../exim4-config_4.52-2_all.deb) ...
+Unpacking replacement exim4-config ...
+Preparing to replace exim4-base 4.52-1 (using .../exim4-base_4.52-2_i386.deb) ...
+Unpacking replacement exim4-base ...
 Preparing to replace passwd 1:4.0.3-35 (using .../passwd_1%3a4.0.3-39_i386.deb) ...
 Unpacking replacement passwd ...
 Setting up passwd (4.0.3-39) ...
 
-(Reading database ... 11434 files and directories currently installed.)
+(Reading database ... 11446 files and directories currently installed.)
+Preparing to replace sysv-rc 2.86.ds1-1 (using .../sysv-rc_2.86.ds1-1.1_all.deb) ...
+Unpacking replacement sysv-rc ...
+Setting up sysv-rc (2.86.ds1-1.1) ...
+
+(Reading database ... 11446 files and directories currently installed.)
 Preparing to replace zlib1g 1:1.2.2-4 (using .../zlib1g_1%3a1.2.3-3_i386.deb) ...
 Unpacking replacement zlib1g ...
 Setting up zlib1g (1.2.3-3) ...
 
-(Reading database ... 11434 files and directories currently installed.)
-Preparing to replace adduser 3.66 (using .../archives/adduser_3.67_all.deb) ...
-Unpacking replacement adduser ...
+(Reading database ... 11446 files and directories currently installed.)
+Preparing to replace base-config 2.69 (using .../base-config_2.71_all.deb) ...
+Unpacking replacement base-config ...
 Preparing to replace cpio 2.5-1.2 (using .../archives/cpio_2.6-3_i386.deb) ...
 Unpacking replacement cpio ...
-Preparing to replace dmidecode 2.6-1 (using .../dmidecode_2.6-2_i386.deb) ...
+Preparing to replace dmidecode 2.6-1 (using .../dmidecode_2.7-2_i386.deb) ...
 Unpacking replacement dmidecode ...
 Preparing to replace iptables 1.3.1-2 (using .../iptables_1.3.3-2_i386.deb) ...
 Unpacking replacement iptables ...
+Selecting previously deselected package libgnutls12.
+Unpacking libgnutls12 (from .../libgnutls12_1.2.6-1_i386.deb) ...
 Selecting previously deselected package libncursesw5.
 Unpacking libncursesw5 (from .../libncursesw5_5.4-9_i386.deb) ...
 Preparing to replace libssl0.9.7 0.9.7e-3 (using .../libssl0.9.7_0.9.7g-1_i386.deb) ...
 Unpacking replacement libssl0.9.7 ...
-Selecting previously deselected package libselinux1.
-Unpacking libselinux1 (from .../libselinux1_1.24-4_i386.deb) ...
 Preparing to replace logrotate 3.7-5 (using .../logrotate_3.7.1-1_i386.deb) ...
 Unpacking replacement logrotate ...
+Preparing to replace lsb-base 3.0-1 (using .../lsb-base_3.0-5_all.deb) ...
+Unpacking replacement lsb-base ...
 Preparing to replace nano 1.2.4-5 (using .../archives/nano_1.3.8-2_i386.deb) ...
 Unpacking replacement nano ...
-Preparing to replace tasksel 2.28 (using .../archives/tasksel_2.30_all.deb) ...
-Unpacking replacement tasksel ...
-Preparing to replace whiptail 0.51.6-26 (using .../whiptail_0.51.6-29_i386.deb) ...
+Preparing to replace wget 1.10-3+1.10.1beta1 (using .../wget_1.10.1-1_i386.deb) ...
+Unpacking replacement wget ...
+Preparing to replace whiptail 0.51.6-26 (using .../whiptail_0.51.6-30_i386.deb) ...
 Unpacking replacement whiptail ...
-Preparing to replace libnewt0.51 0.51.6-26 (using .../libnewt0.51_0.51.6-29_i386.deb) ...
+Preparing to replace libnewt0.51 0.51.6-26 (using .../libnewt0.51_0.51.6-30_i386.deb) ...
 Unpacking replacement libnewt0.51 ...
+Preparing to replace dselect 1.13.10 (using .../dselect_1.13.11_i386.deb) ...
+Unpacking replacement dselect ...
 Preparing to replace libdb1-compat 2.1.3-7 (using .../libdb1-compat_2.1.3-8_i386.deb) ...
 Unpacking replacement libdb1-compat ...
 Preparing to replace make 3.80-9 (using .../archives/make_3.80-11_i386.deb) ...
 Unpacking replacement make ...
+Preparing to replace dpkg-dev 1.13.10 (using .../dpkg-dev_1.13.11_all.deb) ...
+Unpacking replacement dpkg-dev ...
+Preparing to replace exim4-daemon-light 4.52-1 (using .../exim4-daemon-light_4.52-2_i386.deb) ...
+Unpacking replacement exim4-daemon-light ...
+Preparing to replace exim4 4.52-1 (using .../archives/exim4_4.52-2_all.deb) ...
+Unpacking replacement exim4 ...
 Preparing to replace telnet 0.17-29 (using .../telnet_0.17-30_i386.deb) ...
 Unpacking replacement telnet ...
-Preparing to replace gcc-4.0 4.0.1-2 (using .../gcc-4.0_4.0.1-4_i386.deb) ...
+Preparing to replace cpp-4.0 4.0.1-2 (using .../cpp-4.0_4.0.1-6_i386.deb) ...
+Unpacking replacement cpp-4.0 ...
+Preparing to replace gcc-4.0 4.0.1-2 (using .../gcc-4.0_4.0.1-6_i386.deb) ...
 Unpacking replacement gcc-4.0 ...
-Preparing to replace libstdc++6-4.0-dev 4.0.1-2 (using .../libstdc++6-4.0-dev_4.0.1-4_i386.deb) ...
+Preparing to replace libstdc++6-4.0-dev 4.0.1-2 (using .../libstdc++6-4.0-dev_4.0.1-6_i386.deb) ...
 Unpacking replacement libstdc++6-4.0-dev ...
-Preparing to replace g++-4.0 4.0.1-2 (using .../g++-4.0_4.0.1-4_i386.deb) ...
+Preparing to replace g++-4.0 4.0.1-2 (using .../g++-4.0_4.0.1-6_i386.deb) ...
 Unpacking replacement g++-4.0 ...
-Preparing to replace cpp-4.0 4.0.1-2 (using .../cpp-4.0_4.0.1-4_i386.deb) ...
-Unpacking replacement cpp-4.0 ...
-Preparing to replace dhcp3-client 3.0.1-2 (using .../dhcp3-client_3.0.2-3_i386.deb) ...
-Unpacking replacement dhcp3-client ...
-Preparing to replace dhcp3-common 3.0.1-2 (using .../dhcp3-common_3.0.2-3_i386.deb) ...
-Unpacking replacement dhcp3-common ...
-Setting up linux-kernel-headers (2.6.13+0rc3-1.1) ...
-Setting up libc6-dev (2.3.5-3) ...
+Setting up libc6-dev (2.3.5-4) ...
 Setting up libdb4.2 (4.2.52-19) ...
 Setting up apt-utils (0.6.40.1) ...
 
@@ -312,54 +375,60 @@ Setting up libsigc++-1.2-5c2 (1.2.5-5) ...
 
 Setting up aptitude (0.2.15.9-6) ...
 
-Setting up lsb-base (3.0-5) ...
+Setting up libselinux1 (1.24-4) ...
+
+Setting up cron (3.0pl1-91) ...
+Installing new version of config file /etc/cron.daily/standard ...
+Installing new version of config file /etc/pam.d/cron ...
+
+Setting up exim4-config (4.52-2) ...
+Installing new version of config file /etc/exim4/exim4.conf.template ...
+Installing new version of config file /etc/exim4/conf.d/auth/30_exim4-config_examples ...
+
+Setting up exim4-base (4.52-2) ...
+Installing new version of config file /etc/cron.daily/exim4-base ...
+
+Setting up base-config (2.71) ...
+
 Setting up cpio (2.6-3) ...
 
-Setting up dmidecode (2.6-2) ...
+Setting up dmidecode (2.7-2) ...
 Setting up iptables (1.3.3-2) ...
 
+Setting up libgnutls12 (1.2.6-1) ...
+
 Setting up libncursesw5 (5.4-9) ...
 
-Setting up libselinux1 (1.24-4) ...
+Setting up libssl0.9.7 (0.9.7g-1) ...
 
 Setting up logrotate (3.7.1-1) ...
+Setting up lsb-base (3.0-5) ...
 Setting up nano (1.3.8-2) ...
 Installing new version of config file /etc/nanorc ...
 
-Setting up libnewt0.51 (0.51.6-29) ...
+Setting up wget (1.10.1-1) ...
+
+Setting up libnewt0.51 (0.51.6-30) ...
 
-Setting up whiptail (0.51.6-29) ...
+Setting up whiptail (0.51.6-30) ...
+Setting up dselect (1.13.11) ...
 Setting up libdb1-compat (2.1.3-8) ...
 
 Setting up make (3.80-11) ...
 
+Setting up exim4-daemon-light (4.52-2) ...
+
+Setting up exim4 (4.52-2) ...
 Setting up telnet (0.17-30) ...
 
-Setting up cpp-4.0 (4.0.1-4) ...
-Setting up gcc-4.0 (4.0.1-4) ...
+Setting up cpp-4.0 (4.0.1-6) ...
+Setting up gcc-4.0 (4.0.1-6) ...
 Setting up perl-modules (5.8.7-4) ...
-Setting up debconf-i18n (1.4.57) ...
-Setting up libstdc++6-4.0-dev (4.0.1-4) ...
+Setting up libstdc++6-4.0-dev (4.0.1-6) ...
 Setting up perl (5.8.7-4) ...
 
-Setting up debconf (1.4.57) ...
-
-Setting up adduser (3.67) ...
-
-Setting up libssl0.9.7 (0.9.7g-1) ...
-
-Setting up tasksel (2.30) ...
-
-Setting up g++-4.0 (4.0.1-4) ...
-Setting up dhcp3-common (3.0.2-3) ...
-Setting up dhcp3-client (3.0.2-3) ...
-Installing new version of config file /etc/dhcp3/dhclient-script ...
-
-Setting up console-common (0.7.53) ...
-Installing new version of config file /etc/init.d/keymap.sh ...
-Looking for keymap to install:
-NONE
-
+Setting up dpkg-dev (1.13.11) ...
+Setting up g++-4.0 (4.0.1-6) ...
 Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
@@ -368,6 +437,6 @@ apt is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//22150 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//26171 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 0df5178..29a1b35 100644
--- a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid-experimental.log
+++ b/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid-experimental.log
@@ -1,6 +1,6 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -17,8 +17,8 @@ Ign http://ftp.jp.debian.org sid Release
 Get:4 http://ftp.jp.debian.org ../project/experimental Release [21.6kB]
 Ign http://ftp.jp.debian.org ../project/experimental Release
 Hit http://ftp.jp.debian.org sid/main Packages
-Get:5 http://ftp.jp.debian.org ../project/experimental/main Packages [163kB]
-Fetched 219kB in 0s (428kB/s)
+Get:5 http://ftp.jp.debian.org ../project/experimental/main Packages [159kB]
+Fetched 215kB in 0s (240kB/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: GPG error: http://ftp.jp.debian.org ../project/experimental Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
@@ -29,37 +29,42 @@ Building dependency tree...
 The following packages have been kept back:
   aptitude
 The following packages will be upgraded:
-  diff login makedev passwd
-4 upgraded, 0 newly installed, 0 to remove and 1 not upgraded.
-Need to get 1336kB of archives.
-After unpacking 627kB of additional disk space will be used.
+  adduser diff login makedev passwd
+5 upgraded, 0 newly installed, 0 to remove and 1 not upgraded.
+Need to get 1446kB of archives.
+After unpacking 623kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
-  diff login passwd makedev
+  diff login passwd adduser makedev
 Get:1 http://ftp.jp.debian.org ../project/experimental/main diff 2.8.7-0.2 [241kB]
 Get:2 http://ftp.jp.debian.org ../project/experimental/main login 1:4.0.11.1-1 [485kB]
 Get:3 http://ftp.jp.debian.org ../project/experimental/main passwd 1:4.0.11.1-1 [518kB]
-Get:4 http://ftp.jp.debian.org ../project/experimental/main makedev 3.3.8.2-0 [92.2kB]
+Get:4 http://ftp.jp.debian.org ../project/experimental/main adduser 3.68 [110kB]
+Get:5 http://ftp.jp.debian.org ../project/experimental/main makedev 3.3.8.2-0 [92.2kB]
 Preconfiguring packages ...
-Fetched 1336kB in 0s (1582kB/s)
-(Reading database ... 11872 files and directories currently installed.)
+Fetched 1446kB in 1s (1423kB/s)
+(Reading database ... 11884 files and directories currently installed.)
 Preparing to replace diff 2.8.1-11 (using .../diff_2.8.7-0.2_i386.deb) ...
 Unpacking replacement diff ...
 Setting up diff (2.8.7-0.2) ...
-(Reading database ... 11880 files and directories currently installed.)
+(Reading database ... 11892 files and directories currently installed.)
 Preparing to replace login 1:4.0.3-39 (using .../login_1%3a4.0.11.1-1_i386.deb) ...
 Unpacking replacement login ...
 Setting up login (4.0.11.1-1) ...
 Installing new version of config file /etc/pam.d/su ...
 Installing new version of config file /etc/login.defs ...
 
-(Reading database ... 11886 files and directories currently installed.)
+(Reading database ... 11898 files and directories currently installed.)
 Preparing to replace passwd 1:4.0.3-39 (using .../passwd_1%3a4.0.11.1-1_i386.deb) ...
 Unpacking replacement passwd ...
 Setting up passwd (4.0.11.1-1) ...
 
-(Reading database ... 11899 files and directories currently installed.)
+(Reading database ... 11911 files and directories currently installed.)
+Preparing to replace adduser 3.67 (using .../archives/adduser_3.68_all.deb) ...
+Unpacking replacement adduser ...
 Preparing to replace makedev 2.3.1-78 (using .../makedev_3.3.8.2-0_i386.deb) ...
 Unpacking replacement makedev ...
+Setting up adduser (3.68) ...
+
 Setting up makedev (3.3.8.2-0) ...
 Reading package lists...
 Building dependency tree...
@@ -69,6 +74,6 @@ apt is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded.
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//19468 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//24111 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log b/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log
index bd368a4..eebce53 100644
--- a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log
@@ -1,6 +1,6 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -9,9 +9,9 @@ Building the build Environment
   -> Installing apt-lines
 Refreshing the base.tgz 
  -> upgrading packages
-Get:1 http://ftp.jp.debian.org sid/main Packages [3758kB]
+Get:1 http://ftp.jp.debian.org sid/main Packages [3789kB]
 Get:2 http://ftp.jp.debian.org sid/main Release [82B]
-Fetched 3758kB in 3s (1144kB/s)
+Fetched 3789kB in 2s (1491kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading Package Lists...
@@ -19,126 +19,153 @@ Building Dependency Tree...
 The following packages will be REMOVED:
   libsigc++-1.2-5c102
 The following NEW packages will be installed:
-  libncursesw5 libselinux1 libsigc++-1.2-5c2 lsb-base
+  libgnutls12 libncursesw5 libselinux1 libsigc++-1.2-5c2
 The following packages will be upgraded:
-  adduser apt apt-utils aptitude bsdutils console-common cpio cpp-3.3 cpp-4.0
-  debconf debconf-i18n debianutils dhcp3-client dhcp3-common dmidecode e2fslibs
-  e2fsprogs g++-3.3 g++-4.0 gcc-3.3 gcc-3.3-base gcc-4.0 gcc-4.0-base iptables
-  libblkid1 libc6 libc6-dev libcomerr2 libdb1-compat libdb4.2 libgcc1
-  libnewt0.51 libpam-modules libpam-runtime libpam0g libslang2 libss2
-  libssl0.9.7 libstdc++5 libstdc++5-3.3-dev libstdc++6 libstdc++6-4.0-dev
-  libuuid1 linux-kernel-headers login logrotate make module-init-tools modutils
-  mount nano passwd perl perl-base perl-modules sed tar tasksel telnet
-  util-linux whiptail zlib1g
-62 upgraded, 4 newly installed, 1 to remove and 0 not upgraded.
-Need to get 41.3MB of archives.
-After unpacking 2465kB of additional disk space will be used.
-Get:1 http://ftp.jp.debian.org sid/main linux-kernel-headers 2.6.13+0rc3-1.1 [1544kB]
-Get:2 http://ftp.jp.debian.org sid/main libc6-dev 2.3.5-3 [2678kB]
-Get:3 http://ftp.jp.debian.org sid/main libc6 2.3.5-3 [4927kB]
-Get:4 http://ftp.jp.debian.org sid/main libdb4.2 4.2.52-19 [388kB]
-Get:5 http://ftp.jp.debian.org sid/main libgcc1 1:4.0.1-4 [89.9kB]
-Get:6 http://ftp.jp.debian.org sid/main gcc-4.0-base 4.0.1-4 [175kB]
-Get:7 http://ftp.jp.debian.org sid/main libstdc++6 4.0.1-4 [352kB]
-Get:8 http://ftp.jp.debian.org sid/main apt-utils 0.6.40.1 [199kB]
-Get:9 http://ftp.jp.debian.org sid/main libsigc++-1.2-5c2 1.2.5-5 [21.7kB]
-Get:10 http://ftp.jp.debian.org sid/main aptitude 0.2.15.9-6 [1027kB]
-Get:11 http://ftp.jp.debian.org sid/main apt 0.6.40.1 [1226kB]
-Get:12 http://ftp.jp.debian.org sid/main bsdutils 1:2.12p-5 [66.3kB]
-Get:13 http://ftp.jp.debian.org sid/main debianutils 2.14.2 [56.5kB]
-Get:14 http://ftp.jp.debian.org sid/main e2fslibs 1.38-1.1 [78.5kB]
-Get:15 http://ftp.jp.debian.org sid/main e2fsprogs 1.38-1.1 [522kB]
-Get:16 http://ftp.jp.debian.org sid/main libpam-runtime 0.76-23 [59.1kB]
-Get:17 http://ftp.jp.debian.org sid/main libpam0g 0.76-23 [74.3kB]
-Get:18 http://ftp.jp.debian.org sid/main libpam-modules 0.76-23 [147kB]
-Get:19 http://ftp.jp.debian.org sid/main login 1:4.0.3-39 [579kB]
-Get:20 http://ftp.jp.debian.org sid/main mount 2.12p-5 [140kB]
-Get:21 http://ftp.jp.debian.org sid/main perl-modules 5.8.7-4 [2326kB]
-Get:22 http://ftp.jp.debian.org sid/main perl 5.8.7-4 [3378kB]
-Get:23 http://ftp.jp.debian.org sid/main perl-base 5.8.7-4 [781kB]
-Get:24 http://ftp.jp.debian.org sid/main sed 4.1.4-2 [242kB]
-Get:25 http://ftp.jp.debian.org sid/main tar 1.15.1-2 [756kB]
-Get:26 http://ftp.jp.debian.org sid/main util-linux 2.12p-5 [382kB]
-Get:27 http://ftp.jp.debian.org sid/main lsb-base 3.0-5 [9834B]
-Get:28 http://ftp.jp.debian.org sid/main console-common 0.7.53 [116kB]
-Get:29 http://ftp.jp.debian.org sid/main debconf-i18n 1.4.57 [109kB]
-Get:30 http://ftp.jp.debian.org sid/main debconf 1.4.57 [110kB]
-Get:31 http://ftp.jp.debian.org sid/main libslang2 2.0.4-4 [406kB]
-Get:32 http://ftp.jp.debian.org sid/main libblkid1 1.38-1.1 [42.2kB]
-Get:33 http://ftp.jp.debian.org sid/main libcomerr2 1.38-1.1 [27.3kB]
-Get:34 http://ftp.jp.debian.org sid/main libss2 1.38-1.1 [33.2kB]
-Get:35 http://ftp.jp.debian.org sid/main gcc-3.3-base 1:3.3.6-8 [150kB]
-Get:36 http://ftp.jp.debian.org sid/main libstdc++5 1:3.3.6-8 [295kB]
-Get:37 http://ftp.jp.debian.org sid/main libuuid1 1.38-1.1 [32.1kB]
-Get:38 http://ftp.jp.debian.org sid/main passwd 1:4.0.3-39 [514kB]
-Get:39 http://ftp.jp.debian.org sid/main zlib1g 1:1.2.3-3 [69.0kB]
-Get:40 http://ftp.jp.debian.org sid/main adduser 3.67 [110kB]
-Get:41 http://ftp.jp.debian.org sid/main cpio 2.6-3 [119kB]
-Get:42 http://ftp.jp.debian.org sid/main dmidecode 2.6-2 [47.4kB]
-Get:43 http://ftp.jp.debian.org sid/main iptables 1.3.3-2 [390kB]
-Get:44 http://ftp.jp.debian.org sid/main libncursesw5 5.4-9 [307kB]
-Get:45 http://ftp.jp.debian.org sid/main libssl0.9.7 0.9.7g-1 [2215kB]
-Get:46 http://ftp.jp.debian.org sid/main libselinux1 1.24-4 [46.5kB]
-Get:47 http://ftp.jp.debian.org sid/main logrotate 3.7.1-1 [34.1kB]
-Get:48 http://ftp.jp.debian.org sid/main module-init-tools 3.2-pre8-1 [72.7kB]
-Get:49 http://ftp.jp.debian.org sid/main modutils 2.4.27.0-3 [235kB]
-Get:50 http://ftp.jp.debian.org sid/main nano 1.3.8-2 [403kB]
-Get:51 http://ftp.jp.debian.org sid/main tasksel 2.30 [151kB]
-Get:52 http://ftp.jp.debian.org sid/main whiptail 0.51.6-29 [32.5kB]
-Get:53 http://ftp.jp.debian.org sid/main libnewt0.51 0.51.6-29 [59.4kB]
-Get:54 http://ftp.jp.debian.org sid/main libdb1-compat 2.1.3-8 [33.0kB]
-Get:55 http://ftp.jp.debian.org sid/main cpp-3.3 1:3.3.6-8 [1385kB]
-Get:56 http://ftp.jp.debian.org sid/main gcc-3.3 1:3.3.6-8 [1553kB]
-Get:57 http://ftp.jp.debian.org sid/main libstdc++5-3.3-dev 1:3.3.6-8 [775kB]
-Get:58 http://ftp.jp.debian.org sid/main g++-3.3 1:3.3.6-8 [1772kB]
-Get:59 http://ftp.jp.debian.org sid/main make 3.80-11 [367kB]
-Get:60 http://ftp.jp.debian.org sid/main telnet 0.17-30 [64.3kB]
-Get:61 http://ftp.jp.debian.org sid/main gcc-4.0 4.0.1-4 [502kB]
-Get:62 http://ftp.jp.debian.org sid/main libstdc++6-4.0-dev 4.0.1-4 [1517kB]
-Get:63 http://ftp.jp.debian.org sid/main g++-4.0 4.0.1-4 [2325kB]
-Get:64 http://ftp.jp.debian.org sid/main cpp-4.0 4.0.1-4 [2041kB]
-Get:65 http://ftp.jp.debian.org sid/main dhcp3-client 3.0.2-3 [420kB]
-Get:66 http://ftp.jp.debian.org sid/main dhcp3-common 3.0.2-3 [176kB]
+  apt apt-utils aptitude base-config bsdutils cpio cpp-3.3 cpp-4.0 cron
+  debianutils dmidecode dpkg dpkg-dev dselect e2fslibs e2fsprogs exim4
+  exim4-base exim4-config exim4-daemon-light g++-3.3 g++-4.0 gcc-3.3
+  gcc-3.3-base gcc-4.0 gcc-4.0-base hostname initscripts iptables libblkid1
+  libc6 libc6-dev libcomerr2 libdb1-compat libdb4.2 libgcc1 libnewt0.51
+  libpam-modules libpam-runtime libpam0g libslang2 libss2 libssl0.9.7
+  libstdc++5 libstdc++5-3.3-dev libstdc++6 libstdc++6-4.0-dev libuuid1 login
+  logrotate lsb-base make module-init-tools modutils mount nano passwd perl
+  perl-base perl-modules sed sysv-rc sysvinit tar telnet util-linux wget
+  whiptail zlib1g
+69 upgraded, 4 newly installed, 1 to remove and 0 not upgraded.
+Need to get 43.6MB of archives.
+After unpacking 2970kB of additional disk space will be used.
+Get:1 http://ftp.jp.debian.org sid/main libc6-dev 2.3.5-4 [2679kB]
+Get:2 http://ftp.jp.debian.org sid/main libc6 2.3.5-4 [4927kB]
+Get:3 http://ftp.jp.debian.org sid/main libdb4.2 4.2.52-19 [388kB]
+Get:4 http://ftp.jp.debian.org sid/main libgcc1 1:4.0.1-6 [90.5kB]
+Get:5 http://ftp.jp.debian.org sid/main gcc-4.0-base 4.0.1-6 [175kB]
+Get:6 http://ftp.jp.debian.org sid/main libstdc++6 4.0.1-6 [353kB]
+Get:7 http://ftp.jp.debian.org sid/main apt-utils 0.6.40.1 [199kB]
+Get:8 http://ftp.jp.debian.org sid/main libsigc++-1.2-5c2 1.2.5-5 [21.7kB]
+Get:9 http://ftp.jp.debian.org sid/main aptitude 0.2.15.9-6 [1027kB]
+Get:10 http://ftp.jp.debian.org sid/main apt 0.6.40.1 [1226kB]
+Get:11 http://ftp.jp.debian.org sid/main bsdutils 1:2.12p-7 [66.1kB]
+Get:12 http://ftp.jp.debian.org sid/main debianutils 2.14.2 [56.5kB]
+Get:13 http://ftp.jp.debian.org sid/main dpkg 1.13.11 [1821kB]
+Get:14 http://ftp.jp.debian.org sid/main e2fslibs 1.38-2 [78.9kB]
+Get:15 http://ftp.jp.debian.org sid/main e2fsprogs 1.38-2 [526kB]
+Get:16 http://ftp.jp.debian.org sid/main hostname 2.90 [9556B]
+Get:17 http://ftp.jp.debian.org sid/main libpam-runtime 0.76-23 [59.1kB]
+Get:18 http://ftp.jp.debian.org sid/main libpam0g 0.76-23 [74.3kB]
+Get:19 http://ftp.jp.debian.org sid/main libpam-modules 0.76-23 [147kB]
+Get:20 http://ftp.jp.debian.org sid/main login 1:4.0.3-39 [579kB]
+Get:21 http://ftp.jp.debian.org sid/main mount 2.12p-7 [140kB]
+Get:22 http://ftp.jp.debian.org sid/main perl-modules 5.8.7-4 [2326kB]
+Get:23 http://ftp.jp.debian.org sid/main perl 5.8.7-4 [3378kB]
+Get:24 http://ftp.jp.debian.org sid/main perl-base 5.8.7-4 [781kB]
+Get:25 http://ftp.jp.debian.org sid/main sed 4.1.4-2 [242kB]
+Get:26 http://ftp.jp.debian.org sid/main sysvinit 2.86.ds1-1.1 [96.5kB]
+Get:27 http://ftp.jp.debian.org sid/main tar 1.15.1-2 [756kB]
+Get:28 http://ftp.jp.debian.org sid/main util-linux 2.12p-7 [369kB]
+Get:29 http://ftp.jp.debian.org sid/main libslang2 2.0.4-4 [406kB]
+Get:30 http://ftp.jp.debian.org sid/main initscripts 2.86.ds1-1.1 [32.0kB]
+Get:31 http://ftp.jp.debian.org sid/main libblkid1 1.38-2 [43.6kB]
+Get:32 http://ftp.jp.debian.org sid/main libcomerr2 1.38-2 [27.7kB]
+Get:33 http://ftp.jp.debian.org sid/main libss2 1.38-2 [33.6kB]
+Get:34 http://ftp.jp.debian.org sid/main gcc-3.3-base 1:3.3.6-9 [150kB]
+Get:35 http://ftp.jp.debian.org sid/main libstdc++5 1:3.3.6-9 [295kB]
+Get:36 http://ftp.jp.debian.org sid/main libuuid1 1.38-2 [33.1kB]
+Get:37 http://ftp.jp.debian.org sid/main libselinux1 1.24-4 [46.5kB]
+Get:38 http://ftp.jp.debian.org sid/main cron 3.0pl1-91 [60.0kB]
+Get:39 http://ftp.jp.debian.org sid/main exim4-config 4.52-2 [246kB]
+Get:40 http://ftp.jp.debian.org sid/main exim4-base 4.52-2 [842kB]
+Get:41 http://ftp.jp.debian.org sid/main passwd 1:4.0.3-39 [514kB]
+Get:42 http://ftp.jp.debian.org sid/main sysv-rc 2.86.ds1-1.1 [36.2kB]
+Get:43 http://ftp.jp.debian.org sid/main zlib1g 1:1.2.3-3 [69.0kB]
+Get:44 http://ftp.jp.debian.org sid/main base-config 2.71 [260kB]
+Get:45 http://ftp.jp.debian.org sid/main cpio 2.6-3 [119kB]
+Get:46 http://ftp.jp.debian.org sid/main dmidecode 2.7-2 [50.8kB]
+Get:47 http://ftp.jp.debian.org sid/main iptables 1.3.3-2 [390kB]
+Get:48 http://ftp.jp.debian.org sid/main libgnutls12 1.2.6-1 [349kB]
+Get:49 http://ftp.jp.debian.org sid/main libncursesw5 5.4-9 [307kB]
+Get:50 http://ftp.jp.debian.org sid/main libssl0.9.7 0.9.7g-1 [2215kB]
+Get:51 http://ftp.jp.debian.org sid/main logrotate 3.7.1-1 [34.1kB]
+Get:52 http://ftp.jp.debian.org sid/main lsb-base 3.0-5 [9834B]
+Get:53 http://ftp.jp.debian.org sid/main module-init-tools 3.2-pre8-1 [72.7kB]
+Get:54 http://ftp.jp.debian.org sid/main modutils 2.4.27.0-3 [235kB]
+Get:55 http://ftp.jp.debian.org sid/main nano 1.3.8-2 [403kB]
+Get:56 http://ftp.jp.debian.org sid/main wget 1.10.1-1 [609kB]
+Get:57 http://ftp.jp.debian.org sid/main whiptail 0.51.6-30 [32.5kB]
+Get:58 http://ftp.jp.debian.org sid/main libnewt0.51 0.51.6-30 [59.6kB]
+Get:59 http://ftp.jp.debian.org sid/main dselect 1.13.11 [120kB]
+Get:60 http://ftp.jp.debian.org sid/main libdb1-compat 2.1.3-8 [33.0kB]
+Get:61 http://ftp.jp.debian.org sid/main cpp-3.3 1:3.3.6-9 [1385kB]
+Get:62 http://ftp.jp.debian.org sid/main make 3.80-11 [367kB]
+Get:63 http://ftp.jp.debian.org sid/main dpkg-dev 1.13.11 [163kB]
+Get:64 http://ftp.jp.debian.org sid/main exim4-daemon-light 4.52-2 [375kB]
+Get:65 http://ftp.jp.debian.org sid/main exim4 4.52-2 [1132B]
+Get:66 http://ftp.jp.debian.org sid/main gcc-3.3 1:3.3.6-9 [1554kB]
+Get:67 http://ftp.jp.debian.org sid/main libstdc++5-3.3-dev 1:3.3.6-9 [775kB]
+Get:68 http://ftp.jp.debian.org sid/main g++-3.3 1:3.3.6-9 [1772kB]
+Get:69 http://ftp.jp.debian.org sid/main telnet 0.17-30 [64.3kB]
+Get:70 http://ftp.jp.debian.org sid/main cpp-4.0 4.0.1-6 [2042kB]
+Get:71 http://ftp.jp.debian.org sid/main gcc-4.0 4.0.1-6 [504kB]
+Get:72 http://ftp.jp.debian.org sid/main libstdc++6-4.0-dev 4.0.1-6 [1517kB]
+Get:73 http://ftp.jp.debian.org sid/main g++-4.0 4.0.1-6 [2326kB]
 Preconfiguring packages ...
-Fetched 41.3MB in 22s (1814kB/s)
-(Reading database ... 11722 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-1.1_i386.deb) ...
-Unpacking replacement linux-kernel-headers ...
-Preparing to replace libc6-dev 2.3.2.ds1-22 (using .../libc6-dev_2.3.5-3_i386.deb) ...
+Fetched 43.6MB in 25s (1722kB/s)
+(Reading database ... 11803 files and directories currently installed.)
+Preparing to replace libc6-dev 2.3.2.ds1-22 (using .../libc6-dev_2.3.5-4_i386.deb) ...
 Unpacking replacement libc6-dev ...
-Preparing to replace libc6 2.3.2.ds1-22 (using .../libc6_2.3.5-3_i386.deb) ...
+Preparing to replace libc6 2.3.2.ds1-22 (using .../libc6_2.3.5-4_i386.deb) ...
+
+Name Service Switch update in the C Library: pre-installation question.
+
+Running services and programs that are using NSS need to be restarted,
+otherwise they might not be able to do lookup or authentication any more.
+The installation process is able to restart some services (such as ssh or
+telnetd), but other programs cannot be restarted automatically.  One such
+program that needs manual stopping and restart after the glibc upgrade by
+yourself is xdm - because automatic restart might disconnect your active
+X11 sessions.
+
+Known packages that need to be stopped before the glibc upgrade are:
+        xdm kdm gdm postgresql xscreensaver
+This script does not detect any services to stop now.
+
+If you want to interrupt the upgrade now and continue later, please
+answer No to the question below.
+
+Non-interactive mode, upgrade glibc forcibly
+
 Unpacking replacement libc6 ...
-Setting up libc6 (2.3.5-3) ...
+Setting up libc6 (2.3.5-4) ...
+Checking for services that may need to be restarted...done.
 Current default timezone: 'UTC'.
-Local time is now:      Tue Aug 16 23:02:18 UTC 2005.
-Universal Time is now:  Tue Aug 16 23:02:18 UTC 2005.
+Local time is now:      Thu Aug 25 00:55:23 UTC 2005.
+Universal Time is now:  Thu Aug 25 00:55:23 UTC 2005.
 Run 'tzconfig' if you wish to change it.
 
-(Reading database ... 11828 files and directories currently installed.)
+(Reading database ... 11837 files and directories currently installed.)
 Preparing to replace libdb4.2 4.2.52-18 (using .../libdb4.2_4.2.52-19_i386.deb) ...
 Unpacking replacement libdb4.2 ...
-Preparing to replace libgcc1 1:4.0.1-2 (using .../libgcc1_1%3a4.0.1-4_i386.deb) ...
+Preparing to replace libgcc1 1:4.0.1-2 (using .../libgcc1_1%3a4.0.1-6_i386.deb) ...
 Unpacking replacement libgcc1 ...
-Setting up libgcc1 (4.0.1-4) ...
+Setting up libgcc1 (4.0.1-6) ...
 
-(Reading database ... 11828 files and directories currently installed.)
-Preparing to replace gcc-4.0-base 4.0.1-2 (using .../gcc-4.0-base_4.0.1-4_i386.deb) ...
+(Reading database ... 11837 files and directories currently installed.)
+Preparing to replace gcc-4.0-base 4.0.1-2 (using .../gcc-4.0-base_4.0.1-6_i386.deb) ...
 Unpacking replacement gcc-4.0-base ...
-Preparing to replace libstdc++6 4.0.1-2 (using .../libstdc++6_4.0.1-4_i386.deb) ...
+Preparing to replace libstdc++6 4.0.1-2 (using .../libstdc++6_4.0.1-6_i386.deb) ...
 Unpacking replacement libstdc++6 ...
-Setting up gcc-4.0-base (4.0.1-4) ...
-Setting up libstdc++6 (4.0.1-4) ...
+Setting up gcc-4.0-base (4.0.1-6) ...
+Setting up libstdc++6 (4.0.1-6) ...
 
-(Reading database ... 11828 files and directories currently installed.)
+(Reading database ... 11837 files and directories currently installed.)
 Preparing to replace apt-utils 0.5.28.6 (using .../apt-utils_0.6.40.1_i386.deb) ...
 Unpacking replacement apt-utils ...
 dpkg: libsigc++-1.2-5c102: dependency problems, but removing anyway as you request:
  aptitude depends on libsigc++-1.2-5c102; however:
   Package libsigc++-1.2-5c102 is to be removed.
-(Reading database ... 11828 files and directories currently installed.)
+(Reading database ... 11837 files and directories currently installed.)
 Removing libsigc++-1.2-5c102 ...
 Selecting previously deselected package libsigc++-1.2-5c2.
-(Reading database ... 11822 files and directories currently installed.)
+(Reading database ... 11831 files and directories currently installed.)
 Unpacking libsigc++-1.2-5c2 (from .../libsigc++-1.2-5c2_1.2.5-5_i386.deb) ...
 Preparing to replace aptitude 0.2.15.9-2 (using .../aptitude_0.2.15.9-6_i386.deb) ...
 Unpacking replacement aptitude ...
@@ -146,54 +173,63 @@ Preparing to replace apt 0.5.28.6 (using .../archives/apt_0.6.40.1_i386.deb) ...
 Unpacking replacement apt ...
 Setting up apt (0.6.40.1) ...
 
-(Reading database ... 11795 files and directories currently installed.)
-Preparing to replace bsdutils 1:2.12p-4 (using .../bsdutils_1%3a2.12p-5_i386.deb) ...
+(Reading database ... 11804 files and directories currently installed.)
+Preparing to replace bsdutils 1:2.12p-4 (using .../bsdutils_1%3a2.12p-7_i386.deb) ...
 Unpacking replacement bsdutils ...
-Setting up bsdutils (2.12p-5) ...
+Setting up bsdutils (2.12p-7) ...
 
-(Reading database ... 11795 files and directories currently installed.)
+(Reading database ... 11804 files and directories currently installed.)
 Preparing to replace debianutils 2.14.1 (using .../debianutils_2.14.2_i386.deb) ...
 Unpacking replacement debianutils ...
 Setting up debianutils (2.14.2) ...
 
-(Reading database ... 11804 files and directories currently installed.)
-Preparing to replace e2fslibs 1.37-2sarge1 (using .../e2fslibs_1.38-1.1_i386.deb) ...
+(Reading database ... 11813 files and directories currently installed.)
+Preparing to replace dpkg 1.13.10 (using .../archives/dpkg_1.13.11_i386.deb) ...
+Unpacking replacement dpkg ...
+Setting up dpkg (1.13.11) ...
+
+(Reading database ... 11813 files and directories currently installed.)
+Preparing to replace e2fslibs 1.37-2sarge1 (using .../e2fslibs_1.38-2_i386.deb) ...
 Unpacking replacement e2fslibs ...
-Setting up e2fslibs (1.38-1.1) ...
+Setting up e2fslibs (1.38-2) ...
 
-(Reading database ... 11804 files and directories currently installed.)
-Preparing to replace e2fsprogs 1.37-2sarge1 (using .../e2fsprogs_1.38-1.1_i386.deb) ...
+(Reading database ... 11813 files and directories currently installed.)
+Preparing to replace e2fsprogs 1.37-2sarge1 (using .../e2fsprogs_1.38-2_i386.deb) ...
 Unpacking replacement e2fsprogs ...
-Setting up e2fsprogs (1.38-1.1) ...
-(Reading database ... 11806 files and directories currently installed.)
+Setting up e2fsprogs (1.38-2) ...
+(Reading database ... 11815 files and directories currently installed.)
+Preparing to replace hostname 2.13 (using .../hostname_2.90_i386.deb) ...
+Unpacking replacement hostname ...
+Setting up hostname (2.90) ...
+(Reading database ... 11815 files and directories currently installed.)
 Preparing to replace libpam-runtime 0.76-22 (using .../libpam-runtime_0.76-23_all.deb) ...
 Unpacking replacement libpam-runtime ...
 Setting up libpam-runtime (0.76-23) ...
 Installing new version of config file /etc/pam.conf ...
 
-(Reading database ... 11806 files and directories currently installed.)
+(Reading database ... 11815 files and directories currently installed.)
 Preparing to replace libpam0g 0.76-22 (using .../libpam0g_0.76-23_i386.deb) ...
 Unpacking replacement libpam0g ...
 Setting up libpam0g (0.76-23) ...
 
-(Reading database ... 11806 files and directories currently installed.)
+(Reading database ... 11815 files and directories currently installed.)
 Preparing to replace libpam-modules 0.76-22 (using .../libpam-modules_0.76-23_i386.deb) ...
 Unpacking replacement libpam-modules ...
 Setting up libpam-modules (0.76-23) ...
 Installing new version of config file /etc/security/pam_env.conf ...
 
-(Reading database ... 11806 files and directories currently installed.)
+(Reading database ... 11815 files and directories currently installed.)
 Preparing to replace login 1:4.0.3-35 (using .../login_1%3a4.0.3-39_i386.deb) ...
 Unpacking replacement login ...
 Setting up login (4.0.3-39) ...
 Installing new version of config file /etc/login.defs ...
 
-(Reading database ... 11805 files and directories currently installed.)
-Preparing to replace mount 2.12p-4 (using .../mount_2.12p-5_i386.deb) ...
+(Reading database ... 11814 files and directories currently installed.)
+Preparing to replace mount 2.12p-4 (using .../mount_2.12p-7_i386.deb) ...
 Unpacking replacement mount ...
-Setting up mount (2.12p-5) ...
+Setting up mount (2.12p-7) ...
 
-(Reading database ... 11805 files and directories currently installed.)
+(Reading database ... 11814 files and directories currently installed.)
 Preparing to replace perl-modules 5.8.7-3 (using .../perl-modules_5.8.7-4_all.deb) ...
 Unpacking replacement perl-modules ...
 Preparing to replace perl 5.8.7-3 (using .../archives/perl_5.8.7-4_i386.deb) ...
@@ -201,129 +237,156 @@ Unpacking replacement perl ...
 Preparing to replace perl-base 5.8.7-3 (using .../perl-base_5.8.7-4_i386.deb) ...
 Unpacking replacement perl-base ...
 Setting up perl-base (5.8.7-4) ...
-(Reading database ... 11820 files and directories currently installed.)
+(Reading database ... 11829 files and directories currently installed.)
 Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-2_i386.deb) ...
 Unpacking replacement sed ...
 Setting up sed (4.1.4-2) ...
 
-(Reading database ... 11821 files and directories currently installed.)
+(Reading database ... 11830 files and directories currently installed.)
+Preparing to replace sysvinit 2.86.ds1-1 (using .../sysvinit_2.86.ds1-1.1_i386.deb) ...
+Unpacking replacement sysvinit ...
+Setting up sysvinit (2.86.ds1-1.1) ...
+init: timeout opening/writing control channel /dev/initctl
+
+(Reading database ... 11830 files and directories currently installed.)
 Preparing to replace tar 1.14-2 (using .../archives/tar_1.15.1-2_i386.deb) ...
 Unpacking replacement tar ...
 Setting up tar (1.15.1-2) ...
 
-(Reading database ... 11825 files and directories currently installed.)
-Preparing to replace util-linux 2.12p-4 (using .../util-linux_2.12p-5_i386.deb) ...
+(Reading database ... 11834 files and directories currently installed.)
+Preparing to replace util-linux 2.12p-4 (using .../util-linux_2.12p-7_i386.deb) ...
 Unpacking replacement util-linux ...
-Setting up util-linux (2.12p-5) ...
-
-Selecting previously deselected package lsb-base.
-(Reading database ... 11825 files and directories currently installed.)
-Unpacking lsb-base (from .../lsb-base_3.0-5_all.deb) ...
-Preparing to replace console-common 0.7.52 (using .../console-common_0.7.53_all.deb) ...
-Unpacking replacement console-common ...
-Preparing to replace debconf-i18n 1.4.52 (using .../debconf-i18n_1.4.57_all.deb) ...
-Unpacking replacement debconf-i18n ...
-Preparing to replace debconf 1.4.52 (using .../debconf_1.4.57_all.deb) ...
-Unpacking replacement debconf ...
+Setting up util-linux (2.12p-7) ...
+Installing new version of config file /etc/init.d/hwclock.sh ...
+Installing new version of config file /etc/init.d/hwclockfirst.sh ...
+
+(Reading database ... 11834 files and directories currently installed.)
 Preparing to replace libslang2 2.0.4-2 (using .../libslang2_2.0.4-4_i386.deb) ...
 Unpacking replacement libslang2 ...
 Setting up libslang2 (2.0.4-4) ...
 
-(Reading database ... 11831 files and directories currently installed.)
-Preparing to replace libblkid1 1.37-2sarge1 (using .../libblkid1_1.38-1.1_i386.deb) ...
+(Reading database ... 11834 files and directories currently installed.)
+Preparing to replace initscripts 2.86.ds1-1 (using .../initscripts_2.86.ds1-1.1_i386.deb) ...
+Unpacking replacement initscripts ...
+Setting up initscripts (2.86.ds1-1.1) ...
+Installing new version of config file /etc/init.d/bootclean.sh ...
+Installing new version of config file /etc/init.d/checkroot.sh ...
+Installing new version of config file /etc/init.d/mountnfs.sh ...
+Installing new version of config file /etc/default/tmpfs ...
+
+(Reading database ... 11834 files and directories currently installed.)
+Preparing to replace libblkid1 1.37-2sarge1 (using .../libblkid1_1.38-2_i386.deb) ...
 Unpacking replacement libblkid1 ...
-Setting up libblkid1 (1.38-1.1) ...
+Setting up libblkid1 (1.38-2) ...
 
-(Reading database ... 11831 files and directories currently installed.)
-Preparing to replace libcomerr2 1.37-2sarge1 (using .../libcomerr2_1.38-1.1_i386.deb) ...
+(Reading database ... 11834 files and directories currently installed.)
+Preparing to replace libcomerr2 1.37-2sarge1 (using .../libcomerr2_1.38-2_i386.deb) ...
 Unpacking replacement libcomerr2 ...
-Setting up libcomerr2 (1.38-1.1) ...
+Setting up libcomerr2 (1.38-2) ...
 
-(Reading database ... 11831 files and directories currently installed.)
-Preparing to replace libss2 1.37-2sarge1 (using .../libss2_1.38-1.1_i386.deb) ...
+(Reading database ... 11834 files and directories currently installed.)
+Preparing to replace libss2 1.37-2sarge1 (using .../libss2_1.38-2_i386.deb) ...
 Unpacking replacement libss2 ...
-Setting up libss2 (1.38-1.1) ...
+Setting up libss2 (1.38-2) ...
 
-(Reading database ... 11831 files and directories currently installed.)
-Preparing to replace gcc-3.3-base 1:3.3.6-7 (using .../gcc-3.3-base_1%3a3.3.6-8_i386.deb) ...
+(Reading database ... 11834 files and directories currently installed.)
+Preparing to replace gcc-3.3-base 1:3.3.6-7 (using .../gcc-3.3-base_1%3a3.3.6-9_i386.deb) ...
 Unpacking replacement gcc-3.3-base ...
-Preparing to replace libstdc++5 1:3.3.6-7 (using .../libstdc++5_1%3a3.3.6-8_i386.deb) ...
+Preparing to replace libstdc++5 1:3.3.6-7 (using .../libstdc++5_1%3a3.3.6-9_i386.deb) ...
 Unpacking replacement libstdc++5 ...
-Setting up gcc-3.3-base (3.3.6-8) ...
-Setting up libstdc++5 (3.3.6-8) ...
+Setting up gcc-3.3-base (3.3.6-9) ...
+Setting up libstdc++5 (3.3.6-9) ...
 
-(Reading database ... 11831 files and directories currently installed.)
-Preparing to replace libuuid1 1.37-2sarge1 (using .../libuuid1_1.38-1.1_i386.deb) ...
+(Reading database ... 11834 files and directories currently installed.)
+Preparing to replace libuuid1 1.37-2sarge1 (using .../libuuid1_1.38-2_i386.deb) ...
 Unpacking replacement libuuid1 ...
-Setting up libuuid1 (1.38-1.1) ...
+Setting up libuuid1 (1.38-2) ...
 
-(Reading database ... 11831 files and directories currently installed.)
+Selecting previously deselected package libselinux1.
+(Reading database ... 11834 files and directories currently installed.)
+Unpacking libselinux1 (from .../libselinux1_1.24-4_i386.deb) ...
+Preparing to replace cron 3.0pl1-87 (using .../cron_3.0pl1-91_i386.deb) ...
+Unpacking replacement cron ...
+Preparing to replace exim4-config 4.52-1 (using .../exim4-config_4.52-2_all.deb) ...
+Unpacking replacement exim4-config ...
+Preparing to replace exim4-base 4.52-1 (using .../exim4-base_4.52-2_i386.deb) ...
+Unpacking replacement exim4-base ...
 Preparing to replace passwd 1:4.0.3-35 (using .../passwd_1%3a4.0.3-39_i386.deb) ...
 Unpacking replacement passwd ...
 Setting up passwd (4.0.3-39) ...
 
-(Reading database ... 11828 files and directories currently installed.)
+(Reading database ... 11840 files and directories currently installed.)
+Preparing to replace sysv-rc 2.86.ds1-1 (using .../sysv-rc_2.86.ds1-1.1_all.deb) ...
+Unpacking replacement sysv-rc ...
+Setting up sysv-rc (2.86.ds1-1.1) ...
+
+(Reading database ... 11840 files and directories currently installed.)
 Preparing to replace zlib1g 1:1.2.2-4 (using .../zlib1g_1%3a1.2.3-3_i386.deb) ...
 Unpacking replacement zlib1g ...
 Setting up zlib1g (1.2.3-3) ...
 
-(Reading database ... 11828 files and directories currently installed.)
-Preparing to replace adduser 3.66 (using .../archives/adduser_3.67_all.deb) ...
-Unpacking replacement adduser ...
+(Reading database ... 11840 files and directories currently installed.)
+Preparing to replace base-config 2.69 (using .../base-config_2.71_all.deb) ...
+Unpacking replacement base-config ...
 Preparing to replace cpio 2.5-1.2 (using .../archives/cpio_2.6-3_i386.deb) ...
 Unpacking replacement cpio ...
-Preparing to replace dmidecode 2.6-1 (using .../dmidecode_2.6-2_i386.deb) ...
+Preparing to replace dmidecode 2.6-1 (using .../dmidecode_2.7-2_i386.deb) ...
 Unpacking replacement dmidecode ...
 Preparing to replace iptables 1.3.1-2 (using .../iptables_1.3.3-2_i386.deb) ...
 Unpacking replacement iptables ...
+Selecting previously deselected package libgnutls12.
+Unpacking libgnutls12 (from .../libgnutls12_1.2.6-1_i386.deb) ...
 Selecting previously deselected package libncursesw5.
 Unpacking libncursesw5 (from .../libncursesw5_5.4-9_i386.deb) ...
 Preparing to replace libssl0.9.7 0.9.7e-3 (using .../libssl0.9.7_0.9.7g-1_i386.deb) ...
 Unpacking replacement libssl0.9.7 ...
-Selecting previously deselected package libselinux1.
-Unpacking libselinux1 (from .../libselinux1_1.24-4_i386.deb) ...
 Preparing to replace logrotate 3.7-5 (using .../logrotate_3.7.1-1_i386.deb) ...
 Unpacking replacement logrotate ...
+Preparing to replace lsb-base 3.0-1 (using .../lsb-base_3.0-5_all.deb) ...
+Unpacking replacement lsb-base ...
 Preparing to replace module-init-tools 3.2-pre1-2 (using .../module-init-tools_3.2-pre8-1_i386.deb) ...
 Unpacking replacement module-init-tools ...
 Preparing to replace modutils 2.4.26-1.2 (using .../modutils_2.4.27.0-3_i386.deb) ...
 Unpacking replacement modutils ...
 Preparing to replace nano 1.2.4-5 (using .../archives/nano_1.3.8-2_i386.deb) ...
 Unpacking replacement nano ...
-Preparing to replace tasksel 2.28 (using .../archives/tasksel_2.30_all.deb) ...
-Unpacking replacement tasksel ...
-Preparing to replace whiptail 0.51.6-26 (using .../whiptail_0.51.6-29_i386.deb) ...
+Preparing to replace wget 1.10-3+1.10.1beta1 (using .../wget_1.10.1-1_i386.deb) ...
+Unpacking replacement wget ...
+Preparing to replace whiptail 0.51.6-26 (using .../whiptail_0.51.6-30_i386.deb) ...
 Unpacking replacement whiptail ...
-Preparing to replace libnewt0.51 0.51.6-26 (using .../libnewt0.51_0.51.6-29_i386.deb) ...
+Preparing to replace libnewt0.51 0.51.6-26 (using .../libnewt0.51_0.51.6-30_i386.deb) ...
 Unpacking replacement libnewt0.51 ...
+Preparing to replace dselect 1.13.10 (using .../dselect_1.13.11_i386.deb) ...
+Unpacking replacement dselect ...
 Preparing to replace libdb1-compat 2.1.3-7 (using .../libdb1-compat_2.1.3-8_i386.deb) ...
 Unpacking replacement libdb1-compat ...
-Preparing to replace cpp-3.3 1:3.3.6-7 (using .../cpp-3.3_1%3a3.3.6-8_i386.deb) ...
+Preparing to replace cpp-3.3 1:3.3.6-7 (using .../cpp-3.3_1%3a3.3.6-9_i386.deb) ...
 Unpacking replacement cpp-3.3 ...
-Preparing to replace gcc-3.3 1:3.3.6-7 (using .../gcc-3.3_1%3a3.3.6-8_i386.deb) ...
+Preparing to replace make 3.80-9 (using .../archives/make_3.80-11_i386.deb) ...
+Unpacking replacement make ...
+Preparing to replace dpkg-dev 1.13.10 (using .../dpkg-dev_1.13.11_all.deb) ...
+Unpacking replacement dpkg-dev ...
+Preparing to replace exim4-daemon-light 4.52-1 (using .../exim4-daemon-light_4.52-2_i386.deb) ...
+Unpacking replacement exim4-daemon-light ...
+Preparing to replace exim4 4.52-1 (using .../archives/exim4_4.52-2_all.deb) ...
+Unpacking replacement exim4 ...
+Preparing to replace gcc-3.3 1:3.3.6-7 (using .../gcc-3.3_1%3a3.3.6-9_i386.deb) ...
 Unpacking replacement gcc-3.3 ...
-Preparing to replace libstdc++5-3.3-dev 1:3.3.6-7 (using .../libstdc++5-3.3-dev_1%3a3.3.6-8_i386.deb) ...
+Preparing to replace libstdc++5-3.3-dev 1:3.3.6-7 (using .../libstdc++5-3.3-dev_1%3a3.3.6-9_i386.deb) ...
 Unpacking replacement libstdc++5-3.3-dev ...
-Preparing to replace g++-3.3 1:3.3.6-7 (using .../g++-3.3_1%3a3.3.6-8_i386.deb) ...
+Preparing to replace g++-3.3 1:3.3.6-7 (using .../g++-3.3_1%3a3.3.6-9_i386.deb) ...
 Unpacking replacement g++-3.3 ...
-Preparing to replace make 3.80-9 (using .../archives/make_3.80-11_i386.deb) ...
-Unpacking replacement make ...
 Preparing to replace telnet 0.17-29 (using .../telnet_0.17-30_i386.deb) ...
 Unpacking replacement telnet ...
-Preparing to replace gcc-4.0 4.0.1-2 (using .../gcc-4.0_4.0.1-4_i386.deb) ...
+Preparing to replace cpp-4.0 4.0.1-2 (using .../cpp-4.0_4.0.1-6_i386.deb) ...
+Unpacking replacement cpp-4.0 ...
+Preparing to replace gcc-4.0 4.0.1-2 (using .../gcc-4.0_4.0.1-6_i386.deb) ...
 Unpacking replacement gcc-4.0 ...
-Preparing to replace libstdc++6-4.0-dev 4.0.1-2 (using .../libstdc++6-4.0-dev_4.0.1-4_i386.deb) ...
+Preparing to replace libstdc++6-4.0-dev 4.0.1-2 (using .../libstdc++6-4.0-dev_4.0.1-6_i386.deb) ...
 Unpacking replacement libstdc++6-4.0-dev ...
-Preparing to replace g++-4.0 4.0.1-2 (using .../g++-4.0_4.0.1-4_i386.deb) ...
+Preparing to replace g++-4.0 4.0.1-2 (using .../g++-4.0_4.0.1-6_i386.deb) ...
 Unpacking replacement g++-4.0 ...
-Preparing to replace cpp-4.0 4.0.1-2 (using .../cpp-4.0_4.0.1-4_i386.deb) ...
-Unpacking replacement cpp-4.0 ...
-Preparing to replace dhcp3-client 3.0.1-2 (using .../dhcp3-client_3.0.2-3_i386.deb) ...
-Unpacking replacement dhcp3-client ...
-Preparing to replace dhcp3-common 3.0.1-2 (using .../dhcp3-common_3.0.2-3_i386.deb) ...
-Unpacking replacement dhcp3-common ...
-Setting up linux-kernel-headers (2.6.13+0rc3-1.1) ...
-Setting up libc6-dev (2.3.5-3) ...
+Setting up libc6-dev (2.3.5-4) ...
 Setting up libdb4.2 (4.2.52-19) ...
 Setting up apt-utils (0.6.40.1) ...
 
@@ -331,17 +394,34 @@ Setting up libsigc++-1.2-5c2 (1.2.5-5) ...
 
 Setting up aptitude (0.2.15.9-6) ...
 
-Setting up lsb-base (3.0-5) ...
+Setting up libselinux1 (1.24-4) ...
+
+Setting up cron (3.0pl1-91) ...
+Installing new version of config file /etc/cron.daily/standard ...
+Installing new version of config file /etc/pam.d/cron ...
+
+Setting up exim4-config (4.52-2) ...
+Installing new version of config file /etc/exim4/exim4.conf.template ...
+Installing new version of config file /etc/exim4/conf.d/auth/30_exim4-config_examples ...
+
+Setting up exim4-base (4.52-2) ...
+Installing new version of config file /etc/cron.daily/exim4-base ...
+
+Setting up base-config (2.71) ...
+
 Setting up cpio (2.6-3) ...
 
-Setting up dmidecode (2.6-2) ...
+Setting up dmidecode (2.7-2) ...
 Setting up iptables (1.3.3-2) ...
 
+Setting up libgnutls12 (1.2.6-1) ...
+
 Setting up libncursesw5 (5.4-9) ...
 
-Setting up libselinux1 (1.24-4) ...
+Setting up libssl0.9.7 (0.9.7g-1) ...
 
 Setting up logrotate (3.7.1-1) ...
+Setting up lsb-base (3.0-5) ...
 Setting up module-init-tools (3.2-pre8-1) ...
 Installing new version of config file /etc/init.d/module-init-tools ...
 
@@ -353,44 +433,33 @@ Installing new version of config file /etc/modutils/actions ...
 Setting up nano (1.3.8-2) ...
 Installing new version of config file /etc/nanorc ...
 
-Setting up libnewt0.51 (0.51.6-29) ...
+Setting up wget (1.10.1-1) ...
 
-Setting up whiptail (0.51.6-29) ...
+Setting up libnewt0.51 (0.51.6-30) ...
+
+Setting up whiptail (0.51.6-30) ...
+Setting up dselect (1.13.11) ...
 Setting up libdb1-compat (2.1.3-8) ...
 
-Setting up cpp-3.3 (3.3.6-8) ...
-Setting up gcc-3.3 (3.3.6-8) ...
+Setting up cpp-3.3 (3.3.6-9) ...
 Setting up make (3.80-11) ...
 
+Setting up exim4-daemon-light (4.52-2) ...
+
+Setting up exim4 (4.52-2) ...
+Setting up gcc-3.3 (3.3.6-9) ...
 Setting up telnet (0.17-30) ...
 
-Setting up cpp-4.0 (4.0.1-4) ...
-Setting up gcc-4.0 (4.0.1-4) ...
+Setting up cpp-4.0 (4.0.1-6) ...
+Setting up gcc-4.0 (4.0.1-6) ...
 Setting up perl-modules (5.8.7-4) ...
-Setting up debconf-i18n (1.4.57) ...
-Setting up libstdc++5-3.3-dev (3.3.6-8) ...
-Setting up libstdc++6-4.0-dev (4.0.1-4) ...
+Setting up libstdc++5-3.3-dev (3.3.6-9) ...
+Setting up libstdc++6-4.0-dev (4.0.1-6) ...
 Setting up perl (5.8.7-4) ...
 
-Setting up debconf (1.4.57) ...
-
-Setting up adduser (3.67) ...
-
-Setting up libssl0.9.7 (0.9.7g-1) ...
-
-Setting up tasksel (2.30) ...
-
-Setting up g++-3.3 (3.3.6-8) ...
-Setting up g++-4.0 (4.0.1-4) ...
-Setting up dhcp3-common (3.0.2-3) ...
-Setting up dhcp3-client (3.0.2-3) ...
-Installing new version of config file /etc/dhcp3/dhclient-script ...
-
-Setting up console-common (0.7.53) ...
-Installing new version of config file /etc/init.d/keymap.sh ...
-Looking for keymap to install:
-NONE
-
+Setting up dpkg-dev (1.13.11) ...
+Setting up g++-3.3 (3.3.6-9) ...
+Setting up g++-4.0 (4.0.1-6) ...
 Reading package lists...
 Building dependency tree...
 build-essential is already the newest version.
@@ -399,6 +468,6 @@ apt is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//18066 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//22292 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log b/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log
index 92037c7..9f4ca3f 100644
--- a/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log
@@ -1,6 +1,6 @@
 Upgrading for distribution etch
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -9,30 +9,31 @@ Building the build Environment
   -> Installing apt-lines
 Refreshing the base.tgz 
  -> upgrading packages
-Get:1 http://ftp.jp.debian.org etch/main Packages [3471kB]
+Get:1 http://ftp.jp.debian.org etch/main Packages [3487kB]
 Get:2 http://ftp.jp.debian.org etch/main Release [81B]
-Fetched 3471kB in 2s (1189kB/s)
+Fetched 3487kB in 2s (1313kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading Package Lists...
 Building Dependency Tree...
 The following NEW packages will be installed:
   cpp-4.0 dmidecode g++-4.0 gcc-4.0 gcc-4.0-base laptop-detect libslang2
-  libstdc++6 libstdc++6-4.0-dev
+  libstdc++6 libstdc++6-4.0-dev lsb-base
 The following packages will be upgraded:
   adduser at base-config base-files base-passwd bash binutils bsdmainutils
   build-essential console-common cpp cpp-3.3 cron debconf debconf-i18n
-  debianutils dpkg dpkg-dev dselect exim4 exim4-base exim4-config
-  exim4-daemon-light fdutils findutils g++ g++-3.3 gcc gcc-3.3 gcc-3.3-base
-  gettext-base grep groff-base gzip iptables libacl1 libattr1 libgcc1
-  libgcrypt11 libgpg-error0 liblocale-gettext-perl liblzo1 libncurses5
+  debianutils dhcp3-client dhcp3-common dpkg dpkg-dev dselect exim4 exim4-base
+  exim4-config exim4-daemon-light fdutils findutils g++ g++-3.3 gcc gcc-3.3
+  gcc-3.3-base gettext-base grep groff-base gzip iptables libacl1 libattr1
+  libgcc1 libgcrypt11 libgpg-error0 liblocale-gettext-perl liblzo1 libncurses5
   libnewt0.51 libopencdk8 libpcre3 libstdc++5 libstdc++5-3.3-dev libtasn1-2
-  libtext-charwidth-perl libtext-iconv-perl libtext-wrapi18n-perl login makedev
-  man-db manpages ncurses-base ncurses-bin net-tools netkit-inetd passwd perl
-  perl-base perl-modules procps psmisc setserial tasksel wget whiptail
-70 upgraded, 9 newly installed, 0 to remove and 0 not upgraded.
-Need to get 34.7MB of archives.
-After unpacking 24.5MB of additional disk space will be used.
+  libtext-charwidth-perl libtext-iconv-perl libtext-wrapi18n-perl
+  linux-kernel-headers login makedev man-db manpages ncurses-base ncurses-bin
+  net-tools netkit-inetd passwd perl perl-base perl-modules procps psmisc
+  setserial tasksel wget whiptail
+73 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
+Need to get 36.9MB of archives.
+After unpacking 25.3MB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main base-passwd 3.5.10 [34.7kB]
 Get:2 http://ftp.jp.debian.org etch/main base-files 3.1.6 [34.6kB]
 Get:3 http://ftp.jp.debian.org etch/main libpcre3 5.0-1.1 [159kB]
@@ -45,9 +46,9 @@ Get:9 http://ftp.jp.debian.org etch/main liblocale-gettext-perl 1.05-1 [19.9kB]
 Get:10 http://ftp.jp.debian.org etch/main libtext-iconv-perl 1.4-1 [14.9kB]
 Get:11 http://ftp.jp.debian.org etch/main libtext-charwidth-perl 0.04-2 [11.3kB]
 Get:12 http://ftp.jp.debian.org etch/main libtext-wrapi18n-perl 0.06-2 [8528B]
-Get:13 http://ftp.jp.debian.org etch/main debconf-i18n 1.4.52 [109kB]
-Get:14 http://ftp.jp.debian.org etch/main debconf 1.4.52 [109kB]
-Get:15 http://ftp.jp.debian.org etch/main adduser 3.66 [100kB]
+Get:13 http://ftp.jp.debian.org etch/main debconf-i18n 1.4.57 [109kB]
+Get:14 http://ftp.jp.debian.org etch/main debconf 1.4.57 [110kB]
+Get:15 http://ftp.jp.debian.org etch/main adduser 3.67 [110kB]
 Get:16 http://ftp.jp.debian.org etch/main cron 3.0pl1-87 [58.8kB]
 Get:17 http://ftp.jp.debian.org etch/main exim4-config 4.52-1 [247kB]
 Get:18 http://ftp.jp.debian.org etch/main exim4-base 4.52-1 [834kB]
@@ -61,59 +62,63 @@ Get:25 http://ftp.jp.debian.org etch/main gzip 1.3.5-12 [71.1kB]
 Get:26 http://ftp.jp.debian.org etch/main libncurses5 5.4-9 [290kB]
 Get:27 http://ftp.jp.debian.org etch/main ncurses-bin 5.4-9 [208kB]
 Get:28 http://ftp.jp.debian.org etch/main ncurses-base 5.4-9 [12.8kB]
-Get:29 http://ftp.jp.debian.org etch/main console-common 0.7.52 [116kB]
-Get:30 http://ftp.jp.debian.org etch/main libgcc1 1:4.0.1-2 [89.4kB]
-Get:31 http://ftp.jp.debian.org etch/main binutils 2.16.1-2 [2378kB]
-Get:32 http://ftp.jp.debian.org etch/main libstdc++5-3.3-dev 1:3.3.6-7 [775kB]
-Get:33 http://ftp.jp.debian.org etch/main g++-3.3 1:3.3.6-7 [1779kB]
-Get:34 http://ftp.jp.debian.org etch/main gcc-3.3 1:3.3.6-7 [1556kB]
-Get:35 http://ftp.jp.debian.org etch/main cpp-3.3 1:3.3.6-7 [1393kB]
-Get:36 http://ftp.jp.debian.org etch/main gcc-3.3-base 1:3.3.6-7 [150kB]
-Get:37 http://ftp.jp.debian.org etch/main libstdc++5 1:3.3.6-7 [295kB]
-Get:38 http://ftp.jp.debian.org etch/main dselect 1.13.10 [121kB]
-Get:39 http://ftp.jp.debian.org etch/main libattr1 2.4.21-1.0.1 [7854B]
-Get:40 http://ftp.jp.debian.org etch/main libacl1 2.2.29-1.0.1 [13.6kB]
-Get:41 http://ftp.jp.debian.org etch/main dmidecode 2.6-1 [44.8kB]
-Get:42 http://ftp.jp.debian.org etch/main laptop-detect 0.12.1 [2512B]
-Get:43 http://ftp.jp.debian.org etch/main tasksel 2.28 [154kB]
-Get:44 http://ftp.jp.debian.org etch/main gettext-base 0.14.5-2 [101kB]
-Get:45 http://ftp.jp.debian.org etch/main base-config 2.69 [333kB]
-Get:46 http://ftp.jp.debian.org etch/main bsdmainutils 6.1.2 [170kB]
-Get:47 http://ftp.jp.debian.org etch/main groff-base 1.18.1.1-8 [832kB]
-Get:48 http://ftp.jp.debian.org etch/main iptables 1.3.1-2 [397kB]
-Get:49 http://ftp.jp.debian.org etch/main libgpg-error0 1.1-4 [22.8kB]
-Get:50 http://ftp.jp.debian.org etch/main libgcrypt11 1.2.1-4 [180kB]
-Get:51 http://ftp.jp.debian.org etch/main liblzo1 1.08-2 [48.4kB]
-Get:52 http://ftp.jp.debian.org etch/main libopencdk8 0.5.7-2 [96.3kB]
-Get:53 http://ftp.jp.debian.org etch/main libslang2 2.0.4-2 [408kB]
-Get:54 http://ftp.jp.debian.org etch/main libtasn1-2 0.2.13-1 [46.5kB]
-Get:55 http://ftp.jp.debian.org etch/main man-db 2.4.3-1 [658kB]
-Get:56 http://ftp.jp.debian.org etch/main manpages 2.02-2 [392kB]
-Get:57 http://ftp.jp.debian.org etch/main net-tools 1.60-15 [248kB]
-Get:58 http://ftp.jp.debian.org etch/main netkit-inetd 0.10-10.2 [30.6kB]
-Get:59 http://ftp.jp.debian.org etch/main wget 1.10-3+1.10.1beta1 [451kB]
-Get:60 http://ftp.jp.debian.org etch/main whiptail 0.51.6-26 [32.5kB]
-Get:61 http://ftp.jp.debian.org etch/main libnewt0.51 0.51.6-26 [57.8kB]
-Get:62 http://ftp.jp.debian.org etch/main makedev 2.3.1-78 [40.9kB]
-Get:63 http://ftp.jp.debian.org etch/main procps 1:3.2.5-1 [215kB]
-Get:64 http://ftp.jp.debian.org etch/main at 3.1.9 [41.5kB]
-Get:65 http://ftp.jp.debian.org etch/main gcc-4.0-base 4.0.1-2 [174kB]
-Get:66 http://ftp.jp.debian.org etch/main cpp-4.0 4.0.1-2 [2038kB]
-Get:67 http://ftp.jp.debian.org etch/main cpp 4:4.0.1-3 [30.6kB]
-Get:68 http://ftp.jp.debian.org etch/main dpkg-dev 1.13.10 [163kB]
-Get:69 http://ftp.jp.debian.org etch/main exim4 4.52-1 [1834B]
-Get:70 http://ftp.jp.debian.org etch/main gcc-4.0 4.0.1-2 [495kB]
-Get:71 http://ftp.jp.debian.org etch/main gcc 4:4.0.1-3 [4918B]
-Get:72 http://ftp.jp.debian.org etch/main libstdc++6 4.0.1-2 [353kB]
-Get:73 http://ftp.jp.debian.org etch/main libstdc++6-4.0-dev 4.0.1-2 [1516kB]
-Get:74 http://ftp.jp.debian.org etch/main g++-4.0 4.0.1-2 [2321kB]
-Get:75 http://ftp.jp.debian.org etch/main g++ 4:4.0.1-3 [1384B]
-Get:76 http://ftp.jp.debian.org etch/main build-essential 11.1 [6834B]
-Get:77 http://ftp.jp.debian.org etch/main fdutils 5.5-20050303-1 [347kB]
-Get:78 http://ftp.jp.debian.org etch/main psmisc 21.6-1 [58.9kB]
-Get:79 http://ftp.jp.debian.org etch/main setserial 2.17-41 [54.7kB]
+Get:29 http://ftp.jp.debian.org etch/main lsb-base 3.0-1 [8760B]
+Get:30 http://ftp.jp.debian.org etch/main console-common 0.7.53 [116kB]
+Get:31 http://ftp.jp.debian.org etch/main libgcc1 1:4.0.1-2 [89.4kB]
+Get:32 http://ftp.jp.debian.org etch/main binutils 2.16.1-2 [2378kB]
+Get:33 http://ftp.jp.debian.org etch/main libstdc++5-3.3-dev 1:3.3.6-7 [775kB]
+Get:34 http://ftp.jp.debian.org etch/main g++-3.3 1:3.3.6-7 [1779kB]
+Get:35 http://ftp.jp.debian.org etch/main gcc-3.3 1:3.3.6-7 [1556kB]
+Get:36 http://ftp.jp.debian.org etch/main cpp-3.3 1:3.3.6-7 [1393kB]
+Get:37 http://ftp.jp.debian.org etch/main gcc-3.3-base 1:3.3.6-7 [150kB]
+Get:38 http://ftp.jp.debian.org etch/main libstdc++5 1:3.3.6-7 [295kB]
+Get:39 http://ftp.jp.debian.org etch/main dselect 1.13.10 [121kB]
+Get:40 http://ftp.jp.debian.org etch/main libattr1 2.4.21-1.0.1 [7854B]
+Get:41 http://ftp.jp.debian.org etch/main libacl1 2.2.29-1.0.1 [13.6kB]
+Get:42 http://ftp.jp.debian.org etch/main dmidecode 2.6-1 [44.8kB]
+Get:43 http://ftp.jp.debian.org etch/main laptop-detect 0.12.1 [2512B]
+Get:44 http://ftp.jp.debian.org etch/main tasksel 2.30 [151kB]
+Get:45 http://ftp.jp.debian.org etch/main gettext-base 0.14.5-2 [101kB]
+Get:46 http://ftp.jp.debian.org etch/main base-config 2.69 [333kB]
+Get:47 http://ftp.jp.debian.org etch/main bsdmainutils 6.1.2 [170kB]
+Get:48 http://ftp.jp.debian.org etch/main groff-base 1.18.1.1-8 [832kB]
+Get:49 http://ftp.jp.debian.org etch/main iptables 1.3.1-2 [397kB]
+Get:50 http://ftp.jp.debian.org etch/main libgpg-error0 1.1-4 [22.8kB]
+Get:51 http://ftp.jp.debian.org etch/main libgcrypt11 1.2.1-4 [180kB]
+Get:52 http://ftp.jp.debian.org etch/main liblzo1 1.08-2 [48.4kB]
+Get:53 http://ftp.jp.debian.org etch/main libopencdk8 0.5.7-2 [96.3kB]
+Get:54 http://ftp.jp.debian.org etch/main libslang2 2.0.4-2 [408kB]
+Get:55 http://ftp.jp.debian.org etch/main libtasn1-2 0.2.13-1 [46.5kB]
+Get:56 http://ftp.jp.debian.org etch/main man-db 2.4.3-1 [658kB]
+Get:57 http://ftp.jp.debian.org etch/main manpages 2.02-2 [392kB]
+Get:58 http://ftp.jp.debian.org etch/main net-tools 1.60-15 [248kB]
+Get:59 http://ftp.jp.debian.org etch/main netkit-inetd 0.10-10.2 [30.6kB]
+Get:60 http://ftp.jp.debian.org etch/main wget 1.10-3+1.10.1beta1 [451kB]
+Get:61 http://ftp.jp.debian.org etch/main whiptail 0.51.6-26 [32.5kB]
+Get:62 http://ftp.jp.debian.org etch/main libnewt0.51 0.51.6-26 [57.8kB]
+Get:63 http://ftp.jp.debian.org etch/main makedev 2.3.1-78 [40.9kB]
+Get:64 http://ftp.jp.debian.org etch/main procps 1:3.2.5-1 [215kB]
+Get:65 http://ftp.jp.debian.org etch/main at 3.1.9 [41.5kB]
+Get:66 http://ftp.jp.debian.org etch/main gcc-4.0-base 4.0.1-2 [174kB]
+Get:67 http://ftp.jp.debian.org etch/main cpp-4.0 4.0.1-2 [2038kB]
+Get:68 http://ftp.jp.debian.org etch/main cpp 4:4.0.1-3 [30.6kB]
+Get:69 http://ftp.jp.debian.org etch/main dpkg-dev 1.13.10 [163kB]
+Get:70 http://ftp.jp.debian.org etch/main exim4 4.52-1 [1834B]
+Get:71 http://ftp.jp.debian.org etch/main gcc-4.0 4.0.1-2 [495kB]
+Get:72 http://ftp.jp.debian.org etch/main gcc 4:4.0.1-3 [4918B]
+Get:73 http://ftp.jp.debian.org etch/main libstdc++6 4.0.1-2 [353kB]
+Get:74 http://ftp.jp.debian.org etch/main libstdc++6-4.0-dev 4.0.1-2 [1516kB]
+Get:75 http://ftp.jp.debian.org etch/main g++-4.0 4.0.1-2 [2321kB]
+Get:76 http://ftp.jp.debian.org etch/main g++ 4:4.0.1-3 [1384B]
+Get:77 http://ftp.jp.debian.org etch/main linux-kernel-headers 2.6.13+0rc3-1.1 [1544kB]
+Get:78 http://ftp.jp.debian.org etch/main build-essential 11.1 [6834B]
+Get:79 http://ftp.jp.debian.org etch/main dhcp3-client 3.0.2-3 [420kB]
+Get:80 http://ftp.jp.debian.org etch/main dhcp3-common 3.0.2-3 [176kB]
+Get:81 http://ftp.jp.debian.org etch/main fdutils 5.5-20050303-1 [347kB]
+Get:82 http://ftp.jp.debian.org etch/main psmisc 21.6-1 [58.9kB]
+Get:83 http://ftp.jp.debian.org etch/main setserial 2.17-41 [54.7kB]
 Preconfiguring packages ...
-Fetched 34.7MB in 19s (1803kB/s)
+Fetched 36.9MB in 24s (1508kB/s)
 (Reading database ... 11073 files and directories currently installed.)
 Preparing to replace base-passwd 3.5.9 (using .../base-passwd_3.5.10_i386.deb) ...
 Unpacking replacement base-passwd ...
@@ -154,11 +159,11 @@ Preparing to replace libtext-charwidth-perl 0.04-1 (using .../libtext-charwidth-
 Unpacking replacement libtext-charwidth-perl ...
 Preparing to replace libtext-wrapi18n-perl 0.06-1 (using .../libtext-wrapi18n-perl_0.06-2_all.deb) ...
 Unpacking replacement libtext-wrapi18n-perl ...
-Preparing to replace debconf-i18n 1.4.30.13 (using .../debconf-i18n_1.4.52_all.deb) ...
+Preparing to replace debconf-i18n 1.4.30.13 (using .../debconf-i18n_1.4.57_all.deb) ...
 Unpacking replacement debconf-i18n ...
-Preparing to replace debconf 1.4.30.13 (using .../debconf_1.4.52_all.deb) ...
+Preparing to replace debconf 1.4.30.13 (using .../debconf_1.4.57_all.deb) ...
 Unpacking replacement debconf ...
-Preparing to replace adduser 3.63 (using .../archives/adduser_3.66_all.deb) ...
+Preparing to replace adduser 3.63 (using .../archives/adduser_3.67_all.deb) ...
 Unpacking replacement adduser ...
 Preparing to replace cron 3.0pl1-86 (using .../cron_3.0pl1-87_i386.deb) ...
 Unpacking replacement cron ...
@@ -173,12 +178,12 @@ 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 ... 11239 files and directories currently installed.)
+(Reading database ... 11242 files and directories currently installed.)
 Preparing to replace passwd 1:4.0.3-31sarge5 (using .../passwd_1%3a4.0.3-35_i386.deb) ...
 Unpacking replacement passwd ...
 Setting up passwd (4.0.3-35) ...
 
-(Reading database ... 11245 files and directories currently installed.)
+(Reading database ... 11248 files and directories currently installed.)
 Preparing to replace bash 2.05b-26 (using .../archives/bash_3.0-15_i386.deb) ...
 Unpacking replacement bash ...
 Setting up bash (3.0-15) ...
@@ -187,7 +192,7 @@ Installing new version of config file /etc/skel/.bash_profile ...
 Installing new version of config file /etc/bash.bashrc ...
 Installing new version of config file /etc/bash_completion ...
 
-(Reading database ... 11248 files and directories currently installed.)
+(Reading database ... 11251 files and directories currently installed.)
 Preparing to replace dpkg 1.10.28 (using .../archives/dpkg_1.13.10_i386.deb) ...
 Unpacking replacement dpkg ...
 Setting up dpkg (1.13.10) ...
@@ -201,31 +206,31 @@ 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 ... 11247 files and directories currently installed.)
+(Reading database ... 11250 files and directories currently installed.)
 Preparing to replace findutils 4.1.20-6 (using .../findutils_4.2.24-1_i386.deb) ...
 Unpacking replacement findutils ...
 Setting up findutils (4.2.24-1) ...
 Installing new version of config file /etc/updatedb.conf ...
 
-(Reading database ... 11268 files and directories currently installed.)
+(Reading database ... 11271 files and directories currently installed.)
 Preparing to replace grep 2.5.1.ds1-4 (using .../grep_2.5.1.ds1-5_i386.deb) ...
 Unpacking replacement grep ...
 Setting up grep (2.5.1.ds1-5) ...
-(Reading database ... 11268 files and directories currently installed.)
+(Reading database ... 11271 files and directories currently installed.)
 Preparing to replace gzip 1.3.5-10 (using .../gzip_1.3.5-12_i386.deb) ...
 Unpacking replacement gzip ...
 Setting up gzip (1.3.5-12) ...
 
-(Reading database ... 11268 files and directories currently installed.)
+(Reading database ... 11271 files and directories currently installed.)
 Preparing to replace libncurses5 5.4-4 (using .../libncurses5_5.4-9_i386.deb) ...
 Unpacking replacement libncurses5 ...
 Setting up libncurses5 (5.4-9) ...
 
-(Reading database ... 11269 files and directories currently installed.)
+(Reading database ... 11272 files and directories currently installed.)
 Preparing to replace ncurses-bin 5.4-4 (using .../ncurses-bin_5.4-9_i386.deb) ...
 Unpacking replacement ncurses-bin ...
 Setting up ncurses-bin (5.4-9) ...
-(Reading database ... 11269 files and directories currently installed.)
+(Reading database ... 11272 files and directories currently installed.)
 Preparing to replace ncurses-base 5.4-4 (using .../ncurses-base_5.4-9_all.deb) ...
 Removing obsolete conffile /etc/terminfo/E/Eterm ...
 Removing obsolete conffile /etc/terminfo/E/Eterm-color ...
@@ -263,21 +268,24 @@ 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.4-9) ...
+Selecting previously deselected package lsb-base.
+(Reading database ... 11276 files and directories currently installed.)
+Unpacking lsb-base (from .../lsb-base_3.0-1_all.deb) ...
 Setting up liblocale-gettext-perl (1.05-1) ...
 Setting up libtext-iconv-perl (1.4-1) ...
 Setting up libtext-charwidth-perl (0.04-2) ...
 Setting up libtext-wrapi18n-perl (0.06-2) ...
-Setting up debconf-i18n (1.4.52) ...
-Setting up debconf (1.4.52) ...
+Setting up debconf-i18n (1.4.57) ...
+Setting up debconf (1.4.57) ...
 
-(Reading database ... 11273 files and directories currently installed.)
-Preparing to replace console-common 0.7.49 (using .../console-common_0.7.52_all.deb) ...
+(Reading database ... 11281 files and directories currently installed.)
+Preparing to replace console-common 0.7.49 (using .../console-common_0.7.53_all.deb) ...
 Unpacking replacement console-common ...
 Preparing to replace libgcc1 1:3.4.3-13 (using .../libgcc1_1%3a4.0.1-2_i386.deb) ...
 Unpacking replacement libgcc1 ...
 Setting up libgcc1 (4.0.1-2) ...
 
-(Reading database ... 11277 files and directories currently installed.)
+(Reading database ... 11286 files and directories currently installed.)
 Preparing to replace binutils 2.15-6 (using .../binutils_2.16.1-2_i386.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-7_i386.deb) ...
@@ -295,12 +303,12 @@ Unpacking replacement libstdc++5 ...
 Setting up gcc-3.3-base (3.3.6-7) ...
 Setting up libstdc++5 (3.3.6-7) ...
 
-(Reading database ... 11279 files and directories currently installed.)
+(Reading database ... 11288 files and directories currently installed.)
 Preparing to replace dselect 1.10.28 (using .../dselect_1.13.10_i386.deb) ...
 Unpacking replacement dselect ...
 Setting up dselect (1.13.10) ...
 Installing new version of config file /etc/dpkg/dselect.cfg ...
-(Reading database ... 11279 files and directories currently installed.)
+(Reading database ... 11288 files and directories currently installed.)
 Preparing to replace libattr1 2.4.16-1 (using .../libattr1_2.4.21-1.0.1_i386.deb) ...
 Unpacking replacement libattr1 ...
 Preparing to replace libacl1 2.2.23-1 (using .../libacl1_2.2.29-1.0.1_i386.deb) ...
@@ -310,11 +318,11 @@ Setting up libattr1 (2.4.21-1.0.1) ...
 Setting up libacl1 (2.2.29-1.0.1) ...
 
 Selecting previously deselected package dmidecode.
-(Reading database ... 11279 files and directories currently installed.)
+(Reading database ... 11288 files and directories currently installed.)
 Unpacking dmidecode (from .../dmidecode_2.6-1_i386.deb) ...
 Selecting previously deselected package laptop-detect.
 Unpacking laptop-detect (from .../laptop-detect_0.12.1_i386.deb) ...
-Preparing to replace tasksel 2.24 (using .../archives/tasksel_2.28_all.deb) ...
+Preparing to replace tasksel 2.24 (using .../archives/tasksel_2.30_all.deb) ...
 Unpacking replacement tasksel ...
 Preparing to replace gettext-base 0.14.4-2 (using .../gettext-base_0.14.5-2_i386.deb) ...
 Unpacking replacement gettext-base ...
@@ -382,8 +390,14 @@ Selecting previously deselected package g++-4.0.
 Unpacking g++-4.0 (from .../g++-4.0_4.0.1-2_i386.deb) ...
 Preparing to replace g++ 4:3.3.5-3 (using .../g++_4%3a4.0.1-3_i386.deb) ...
 Unpacking replacement g++ ...
+Preparing to replace linux-kernel-headers 2.5.999-test7-bk-17 (using .../linux-kernel-headers_2.6.13+0rc3-1.1_i386.deb) ...
+Unpacking replacement linux-kernel-headers ...
 Preparing to replace build-essential 10.1 (using .../build-essential_11.1_i386.deb) ...
 Unpacking replacement build-essential ...
+Preparing to replace dhcp3-client 3.0.1-2 (using .../dhcp3-client_3.0.2-3_i386.deb) ...
+Unpacking replacement dhcp3-client ...
+Preparing to replace dhcp3-common 3.0.1-2 (using .../dhcp3-common_3.0.2-3_i386.deb) ...
+Unpacking replacement dhcp3-common ...
 Preparing to replace fdutils 5.4-20040228-1 (using .../fdutils_5.5-20050303-1_i386.deb) ...
 Unpacking replacement fdutils ...
 Preparing to replace psmisc 21.5-1 (using .../psmisc_21.6-1_i386.deb) ...
@@ -392,7 +406,7 @@ Preparing to replace setserial 2.17-40 (using .../setserial_2.17-41_i386.deb) ..
 Unpacking replacement setserial ...
 Setting up libpcre3 (5.0-1.1) ...
 
-Setting up adduser (3.66) ...
+Setting up adduser (3.67) ...
 
 Setting up cron (3.0pl1-87) ...
 
@@ -407,7 +421,9 @@ Setting up exim4-base (4.52-1) ...
 
 Setting up exim4-daemon-light (4.52-1) ...
 
-Setting up console-common (0.7.52) ...
+Setting up lsb-base (3.0-1) ...
+Setting up console-common (0.7.53) ...
+Installing new version of config file /etc/init.d/keymap.sh ...
 Looking for keymap to install:
 NONE
 
@@ -417,7 +433,7 @@ Setting up cpp-3.3 (3.3.6-7) ...
 Setting up gcc-3.3 (3.3.6-7) ...
 Setting up dmidecode (2.6-1) ...
 Setting up laptop-detect (0.12.1) ...
-Setting up tasksel (2.28) ...
+Setting up tasksel (2.30) ...
 
 Setting up gettext-base (0.14.5-2) ...
 
@@ -473,6 +489,11 @@ Setting up gcc (4.0.1-3) ...
 
 Setting up libstdc++6 (4.0.1-2) ...
 
+Setting up linux-kernel-headers (2.6.13+0rc3-1.1) ...
+Setting up dhcp3-common (3.0.2-3) ...
+Setting up dhcp3-client (3.0.2-3) ...
+Installing new version of config file /etc/dhcp3/dhclient-script ...
+
 Setting up fdutils (5.5-20050303-1) ...
 
 Setting up psmisc (21.6-1) ...
@@ -500,6 +521,6 @@ apt is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//14264 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//16903 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-etch.log b/testsuite/cdebootstrap/pdebuild-internal-etch.log
index 70738b3..c2171ed 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-etch.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-etch.log
@@ -1,10 +1,10 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2
+-> Mounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2
  -> policy-rc.d already exists
 Using: : pdebuild-internal,v 1.6 2005/07/02 05:39:44 dancer Exp $
 Reading Package Lists...
@@ -22,9 +22,9 @@ Need to get 111kB of archives.
 After unpacking 643kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main debootstrap 0.3.1.4 [42.1kB]
 Get:2 http://ftp.jp.debian.org etch/main pbuilder 0.128 [68.6kB]
-Fetched 111kB in 0s (469kB/s)
+Fetched 111kB in 0s (214kB/s)
 Selecting previously deselected package debootstrap.
-(Reading database ... 11328 files and directories currently installed.)
+(Reading database ... 11409 files and directories currently installed.)
 Unpacking debootstrap (from .../debootstrap_0.3.1.4_all.deb) ...
 Selecting previously deselected package pbuilder.
 Unpacking pbuilder (from .../pbuilder_0.128_all.deb) ...
@@ -54,7 +54,7 @@ Need to get 2650kB of archives.
 After unpacking 8360kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main libmagic1 4.12-1 [233kB]
 Get:2 http://ftp.jp.debian.org etch/main file 4.12-1 [28.6kB]
-Get:3 http://ftp.jp.debian.org etch/main debconf-utils 1.4.52 [32.9kB]
+Get:3 http://ftp.jp.debian.org etch/main debconf-utils 1.4.57 [33.0kB]
 Get:4 http://ftp.jp.debian.org etch/main html2text 1.3.2a-2 [92.6kB]
 Get:5 http://ftp.jp.debian.org etch/main gettext 0.14.5-2 [1775kB]
 Get:6 http://ftp.jp.debian.org etch/main intltool-debian 0.30+20040213 [23.5kB]
@@ -62,14 +62,14 @@ Get:7 http://ftp.jp.debian.org etch/main po-debconf 0.8.23 [78.0kB]
 Get:8 http://ftp.jp.debian.org etch/main debhelper 4.9.5 [363kB]
 Get:9 http://ftp.jp.debian.org etch/main libdshconfig1 0.20.11-1 [10.7kB]
 Get:10 http://ftp.jp.debian.org etch/main libdshconfig1-dev 0.20.11-1 [12.4kB]
-Fetched 2650kB in 1s (2116kB/s)
+Fetched 2650kB in 1s (2082kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11407 files and directories currently installed.)
+(Reading database ... 11488 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.12-1_i386.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.12-1_i386.deb) ...
 Selecting previously deselected package debconf-utils.
-Unpacking debconf-utils (from .../debconf-utils_1.4.52_all.deb) ...
+Unpacking debconf-utils (from .../debconf-utils_1.4.57_all.deb) ...
 Selecting previously deselected package html2text.
 Unpacking html2text (from .../html2text_1.3.2a-2_i386.deb) ...
 Selecting previously deselected package gettext.
@@ -87,7 +87,7 @@ Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.11-1_i386.deb) ...
 Setting up libmagic1 (4.12-1) ...
 
 Setting up file (4.12-1) ...
-Setting up debconf-utils (1.4.52) ...
+Setting up debconf-utils (1.4.57) ...
 
 Setting up html2text (1.3.2a-2) ...
 
@@ -108,9 +108,9 @@ The following NEW packages will be installed:
 Need to get 70.4kB of archives.
 After unpacking 201kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main fakeroot 1.3 [70.4kB]
-Fetched 70.4kB in 0s (681kB/s)
+Fetched 70.4kB in 0s (684kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11950 files and directories currently installed.)
+(Reading database ... 12031 files and directories currently installed.)
 Unpacking fakeroot (from .../archives/fakeroot_1.3_i386.deb) ...
 Setting up fakeroot (1.3) ...
 
@@ -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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -318,18 +318,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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; \
@@ -342,26 +342,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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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
@@ -373,7 +373,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
@@ -399,8 +398,8 @@ success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
-c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+c: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -412,7 +411,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
-Tue Aug 16 23:12:41 UTC 2005
+Thu Aug 25 01:09:52 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -482,7 +481,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
-Tue Aug 16 23:12:46 UTC 2005
+Thu Aug 25 01:09:57 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -498,9 +497,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -508,58 +507,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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
   done; \
 else \
   : ; \
 fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -582,6 +581,6 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/14888 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/20024 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-sarge.log b/testsuite/cdebootstrap/pdebuild-internal-sarge.log
index 5020611..38f9dd8 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-sarge.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-sarge.log
@@ -1,10 +1,10 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2
+-> Mounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2
  -> policy-rc.d already exists
 Using: : pdebuild-internal,v 1.6 2005/07/02 05:39:44 dancer Exp $
 Reading Package Lists...
@@ -22,7 +22,7 @@ Need to get 136kB of archives.
 After unpacking 586kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sarge/main debootstrap 0.2.45-0.2 [72.2kB]
 Get:2 http://ftp.jp.debian.org sarge/main pbuilder 0.123 [64.0kB]
-Fetched 136kB in 0s (705kB/s)
+Fetched 136kB in 0s (398kB/s)
 Selecting previously deselected package debootstrap.
 (Reading database ... 11073 files and directories currently installed.)
 Unpacking debootstrap (from .../debootstrap_0.2.45-0.2_i386.deb) ...
@@ -62,7 +62,7 @@ Get:7 http://ftp.jp.debian.org sarge/main po-debconf 0.8.23 [78.0kB]
 Get:8 http://ftp.jp.debian.org sarge/main debhelper 4.2.32 [362kB]
 Get:9 http://ftp.jp.debian.org sarge/main libdshconfig1 0.20.11-1 [10.7kB]
 Get:10 http://ftp.jp.debian.org sarge/main libdshconfig1-dev 0.20.11-1 [12.4kB]
-Fetched 2591kB in 1s (1618kB/s)
+Fetched 2591kB in 2s (1033kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 11148 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.12-1_i386.deb) ...
@@ -108,7 +108,7 @@ The following NEW packages will be installed:
 Need to get 70.5kB of archives.
 After unpacking 201kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sarge/main fakeroot 1.2.10 [70.5kB]
-Fetched 70.5kB in 0s (632kB/s)
+Fetched 70.5kB in 0s (688kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 11690 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.2.10_i386.deb) ...
@@ -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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -318,18 +318,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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; \
@@ -342,26 +342,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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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
@@ -412,7 +412,7 @@ PASS: tests/param-r-invalid.sh
 1: 1
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Tue Aug 16 22:57:26 UTC 2005
+Thu Aug 25 00:50:22 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -482,13 +482,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
-Tue Aug 16 22:57:31 UTC 2005
+Thu Aug 25 00:50:27 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-dsh: Process terminated (before write).
 b: b
+dsh: Process terminated (before write).
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -498,9 +498,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -508,58 +508,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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
   done; \
 else \
   : ; \
 fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -582,6 +582,6 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/8517 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/11112 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-sid.log b/testsuite/cdebootstrap/pdebuild-internal-sid.log
index e4b99d9..20a08e0 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-sid.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-sid.log
@@ -1,10 +1,10 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2
+-> Mounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2
  -> policy-rc.d already exists
 Using: : pdebuild-internal,v 1.6 2005/07/02 05:39:44 dancer Exp $
 Reading package lists...
@@ -23,15 +23,15 @@ After unpacking 643kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   debootstrap pbuilder
 Get:1 http://ftp.jp.debian.org sid/main debootstrap 0.3.1.5 [42.1kB]
-Get:2 http://ftp.jp.debian.org sid/main pbuilder 0.128 [68.6kB]
-Fetched 111kB in 0s (538kB/s)
+Get:2 http://ftp.jp.debian.org sid/main pbuilder 0.129 [69.1kB]
+Fetched 111kB in 0s (338kB/s)
 Selecting previously deselected package debootstrap.
-(Reading database ... 11461 files and directories currently installed.)
+(Reading database ... 11459 files and directories currently installed.)
 Unpacking debootstrap (from .../debootstrap_0.3.1.5_all.deb) ...
 Selecting previously deselected package pbuilder.
-Unpacking pbuilder (from .../pbuilder_0.128_all.deb) ...
+Unpacking pbuilder (from .../pbuilder_0.129_all.deb) ...
 Setting up debootstrap (0.3.1.5) ...
-Setting up pbuilder (0.128) ...
+Setting up pbuilder (0.129) ...
 Setting DEBBUILDOPTS=
  -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.19 2005/06/03 12:07:39 dancer Exp $
  -> Considering  debhelper (>> 3.0.0)
@@ -67,9 +67,9 @@ Get:7 http://ftp.jp.debian.org sid/main po-debconf 0.8.23 [78.0kB]
 Get:8 http://ftp.jp.debian.org sid/main debhelper 4.9.5 [363kB]
 Get:9 http://ftp.jp.debian.org sid/main libdshconfig1 0.20.11-1 [10.7kB]
 Get:10 http://ftp.jp.debian.org sid/main libdshconfig1-dev 0.20.11-1 [12.4kB]
-Fetched 2650kB in 1s (2031kB/s)
+Fetched 2650kB in 1s (1813kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11540 files and directories currently installed.)
+(Reading database ... 11538 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.12-1_i386.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.12-1_i386.deb) ...
@@ -110,16 +110,16 @@ Building dependency tree...
 The following NEW packages will be installed:
   fakeroot
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 69.5kB of archives.
+Need to get 69.6kB of archives.
 After unpacking 193kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
-Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.4.2 [69.5kB]
-Fetched 69.5kB in 0s (686kB/s)
+Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.4.3 [69.6kB]
+Fetched 69.6kB in 0s (756kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12083 files and directories currently installed.)
-Unpacking fakeroot (from .../fakeroot_1.4.2_i386.deb) ...
-Setting up fakeroot (1.4.2) ...
+(Reading database ... 12081 files and directories currently installed.)
+Unpacking fakeroot (from .../fakeroot_1.4.3_i386.deb) ...
+Setting up fakeroot (1.4.3) ...
 
 dpkg-buildpackage: source package is dsh
 dpkg-buildpackage: source version is 0.25.6-1
@@ -130,14 +130,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -325,18 +325,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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; \
@@ -349,26 +349,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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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
@@ -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
-Tue Aug 16 22:50:25 UTC 2005
+Thu Aug 25 00:38:06 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -488,11 +488,12 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Tue Aug 16 22:50:30 UTC 2005
+Thu Aug 25 00:38:11 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
+dsh: Process terminated (before write).
 b: b
 c: c
 PASS: tests/segv-catcher.sh
@@ -503,9 +504,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -513,58 +514,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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
   done; \
 else \
   : ; \
 fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/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/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -587,6 +588,6 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/6761 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/7381 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-etch.log b/testsuite/cdebootstrap/pdebuild-normal-etch.log
index 097ac60..4404c6a 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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -29,10 +29,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/i386 $Id$
 $Id$
 
-Current time: Wed Aug 17 08:10:52 JST 2005
-pbuilder-time-stamp: 1124233852
+Current time: Thu Aug 25 10:06:49 JST 2005
+pbuilder-time-stamp: 1124932009
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -40,7 +40,7 @@ Building the build Environment
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
 Installing the build-deps
- -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.19 2005/06/03 12:07:39 dancer Exp $
+ -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.20 2005/08/17 00:46:54 dancer Exp $
  -> Considering  debhelper (>> 3.0.0)
    -> Trying debhelper
  -> Considering  libdshconfig1-dev (>= 0.20.11-1)
@@ -63,7 +63,7 @@ Need to get 2650kB of archives.
 After unpacking 8360kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main libmagic1 4.12-1 [233kB]
 Get:2 http://ftp.jp.debian.org etch/main file 4.12-1 [28.6kB]
-Get:3 http://ftp.jp.debian.org etch/main debconf-utils 1.4.52 [32.9kB]
+Get:3 http://ftp.jp.debian.org etch/main debconf-utils 1.4.57 [33.0kB]
 Get:4 http://ftp.jp.debian.org etch/main html2text 1.3.2a-2 [92.6kB]
 Get:5 http://ftp.jp.debian.org etch/main gettext 0.14.5-2 [1775kB]
 Get:6 http://ftp.jp.debian.org etch/main intltool-debian 0.30+20040213 [23.5kB]
@@ -71,14 +71,14 @@ Get:7 http://ftp.jp.debian.org etch/main po-debconf 0.8.23 [78.0kB]
 Get:8 http://ftp.jp.debian.org etch/main debhelper 4.9.5 [363kB]
 Get:9 http://ftp.jp.debian.org etch/main libdshconfig1 0.20.11-1 [10.7kB]
 Get:10 http://ftp.jp.debian.org etch/main libdshconfig1-dev 0.20.11-1 [12.4kB]
-Fetched 2650kB in 1s (1803kB/s)
+Fetched 2650kB in 1s (2182kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11328 files and directories currently installed.)
+(Reading database ... 11409 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.12-1_i386.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.12-1_i386.deb) ...
 Selecting previously deselected package debconf-utils.
-Unpacking debconf-utils (from .../debconf-utils_1.4.52_all.deb) ...
+Unpacking debconf-utils (from .../debconf-utils_1.4.57_all.deb) ...
 Selecting previously deselected package html2text.
 Unpacking html2text (from .../html2text_1.3.2a-2_i386.deb) ...
 Selecting previously deselected package gettext.
@@ -96,7 +96,7 @@ Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.11-1_i386.deb) ...
 Setting up libmagic1 (4.12-1) ...
 
 Setting up file (4.12-1) ...
-Setting up debconf-utils (1.4.52) ...
+Setting up debconf-utils (1.4.57) ...
 
 Setting up html2text (1.3.2a-2) ...
 
@@ -117,12 +117,15 @@ The following NEW packages will be installed:
 Need to get 70.4kB of archives.
 After unpacking 201kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main fakeroot 1.3 [70.4kB]
-Fetched 70.4kB in 0s (796kB/s)
+Fetched 70.4kB in 0s (665kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11871 files and directories currently installed.)
+(Reading database ... 11952 files and directories currently installed.)
 Unpacking fakeroot (from .../archives/fakeroot_1.3_i386.deb) ...
 Setting up fakeroot (1.3) ...
 
+/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/13102/etc/passwd
+/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/13102/etc/group
+/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/13102/etc/shadow
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -445,7 +448,7 @@ PASS: tests/param-r-invalid.sh
 1: 1
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Tue Aug 16 23:11:36 UTC 2005
+Thu Aug 25 01:08:06 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -515,11 +518,12 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Tue Aug 16 23:11:41 UTC 2005
+Thu Aug 25 01:08:11 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
+dsh: Process terminated (before write).
 b: b
 c: c
 PASS: tests/segv-catcher.sh
@@ -626,9 +630,9 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> Terminate timeout process
  -> unmounting dev/pts filesystem
-/usr/lib/pbuilder/pbuilder-modules: line 89:  9492 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
+/usr/lib/pbuilder/pbuilder-modules: line 89: 13400 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
  -> unmounting proc filesystem
-Current time: Wed Aug 17 08:11:44 JST 2005
-pbuilder-time-stamp: 1124233904
+Current time: Thu Aug 25 10:08:19 JST 2005
+pbuilder-time-stamp: 1124932099
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/9206 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/13102 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-sarge.log b/testsuite/cdebootstrap/pdebuild-normal-sarge.log
index 5aeb618..e94459d 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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -29,10 +29,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/i386 $Id$
 $Id$
 
-Current time: Wed Aug 17 07:55:55 JST 2005
-pbuilder-time-stamp: 1124232955
+Current time: Thu Aug 25 09:47:30 JST 2005
+pbuilder-time-stamp: 1124930850
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -40,7 +40,7 @@ Building the build Environment
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
 Installing the build-deps
- -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.19 2005/06/03 12:07:39 dancer Exp $
+ -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.20 2005/08/17 00:46:54 dancer Exp $
  -> Considering  debhelper (>> 3.0.0)
    -> Trying debhelper
  -> Considering  libdshconfig1-dev (>= 0.20.11-1)
@@ -71,7 +71,7 @@ Get:7 http://ftp.jp.debian.org sarge/main po-debconf 0.8.23 [78.0kB]
 Get:8 http://ftp.jp.debian.org sarge/main debhelper 4.2.32 [362kB]
 Get:9 http://ftp.jp.debian.org sarge/main libdshconfig1 0.20.11-1 [10.7kB]
 Get:10 http://ftp.jp.debian.org sarge/main libdshconfig1-dev 0.20.11-1 [12.4kB]
-Fetched 2591kB in 1s (1986kB/s)
+Fetched 2591kB in 1s (1805kB/s)
 Selecting previously deselected package libmagic1.
 (Reading database ... 11073 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.12-1_i386.deb) ...
@@ -117,12 +117,14 @@ The following NEW packages will be installed:
 Need to get 70.5kB of archives.
 After unpacking 201kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sarge/main fakeroot 1.2.10 [70.5kB]
-Fetched 70.5kB in 0s (709kB/s)
+Fetched 70.5kB in 0s (688kB/s)
 Selecting previously deselected package fakeroot.
 (Reading database ... 11615 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.2.10_i386.deb) ...
 Setting up fakeroot (1.2.10) ...
 
+/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/5366/etc/passwd
+/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/5366/etc/group
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -442,7 +444,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
-Tue Aug 16 22:56:37 UTC 2005
+Thu Aug 25 00:48:50 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -512,7 +514,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
-Tue Aug 16 22:56:42 UTC 2005
+Thu Aug 25 00:48:55 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -624,9 +626,9 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> Terminate timeout process
  -> unmounting dev/pts filesystem
-/usr/lib/pbuilder/pbuilder-modules: line 89:  3069 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
+/usr/lib/pbuilder/pbuilder-modules: line 89:  5678 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
  -> unmounting proc filesystem
-Current time: Wed Aug 17 07:56:44 JST 2005
-pbuilder-time-stamp: 1124233004
+Current time: Thu Aug 25 09:49:02 JST 2005
+pbuilder-time-stamp: 1124930942
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/2783 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/5366 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-sid.log b/testsuite/cdebootstrap/pdebuild-normal-sid.log
index 5ef5866..b227c72 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/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -29,10 +29,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/i386 $Id$
 $Id$
 
-Current time: Wed Aug 17 07:48:45 JST 2005
-pbuilder-time-stamp: 1124232525
+Current time: Thu Aug 25 09:34:49 JST 2005
+pbuilder-time-stamp: 1124930089
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -40,7 +40,7 @@ Building the build Environment
  -> policy-rc.d already exists
  -> created buildresult dir :/var/cache/pbuilder/result
 Installing the build-deps
- -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.19 2005/06/03 12:07:39 dancer Exp $
+ -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.20 2005/08/17 00:46:54 dancer Exp $
  -> Considering  debhelper (>> 3.0.0)
    -> Trying debhelper
  -> Considering  libdshconfig1-dev (>= 0.20.11-1)
@@ -74,9 +74,9 @@ Get:7 http://ftp.jp.debian.org sid/main po-debconf 0.8.23 [78.0kB]
 Get:8 http://ftp.jp.debian.org sid/main debhelper 4.9.5 [363kB]
 Get:9 http://ftp.jp.debian.org sid/main libdshconfig1 0.20.11-1 [10.7kB]
 Get:10 http://ftp.jp.debian.org sid/main libdshconfig1-dev 0.20.11-1 [12.4kB]
-Fetched 2650kB in 1s (2099kB/s)
+Fetched 2650kB in 1s (2088kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11461 files and directories currently installed.)
+(Reading database ... 11459 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.12-1_i386.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.12-1_i386.deb) ...
@@ -117,17 +117,20 @@ Building dependency tree...
 The following NEW packages will be installed:
   fakeroot
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 69.5kB of archives.
+Need to get 69.6kB of archives.
 After unpacking 193kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
-Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.4.2 [69.5kB]
-Fetched 69.5kB in 0s (697kB/s)
+Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.4.3 [69.6kB]
+Fetched 69.6kB in 0s (671kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12004 files and directories currently installed.)
-Unpacking fakeroot (from .../fakeroot_1.4.2_i386.deb) ...
-Setting up fakeroot (1.4.2) ...
+(Reading database ... 12002 files and directories currently installed.)
+Unpacking fakeroot (from .../fakeroot_1.4.3_i386.deb) ...
+Setting up fakeroot (1.4.3) ...
 
+/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/1556/etc/passwd
+/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/1556/etc/group
+/home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/1556/etc/shadow
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -450,7 +453,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
-Tue Aug 16 22:49:30 UTC 2005
+Thu Aug 25 00:36:19 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -520,14 +523,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
-Tue Aug 16 22:49:35 UTC 2005
+Thu Aug 25 00:36:24 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-c: c
-dsh: Process terminated (before write).
 a: a
+dsh: Process terminated (before write).
 b: b
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -632,9 +635,9 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> Terminate timeout process
  -> unmounting dev/pts filesystem
-/usr/lib/pbuilder/pbuilder-modules: line 89:  1268 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
+/usr/lib/pbuilder/pbuilder-modules: line 89:  1876 Terminated              ( : Timeout process; sleep "${TIMEOUT_TIME}"; echo " -> Terminating build process due to timeout "; kill ${BUILD_PID} || true )
  -> unmounting proc filesystem
-Current time: Wed Aug 17 07:49:38 JST 2005
-pbuilder-time-stamp: 1124232578
+Current time: Thu Aug 25 09:36:32 JST 2005
+pbuilder-time-stamp: 1124930192
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.Z2Z2PR/dir2/981 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/pbuilder/pbuilder/testsuite/tmp.VJ1DuI/dir2/1556 and its subdirectories