testsuite update

12 files changed, 563 insertions, 595 deletions

diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
index 012f45e..5a34f64 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
@@ -2,10 +2,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Wed Oct 25 12:52:11 JST 2006
-pbuilder-time-stamp: 1161748331
+Current time: Sun Oct 29 12:22:39 JST 2006
+pbuilder-time-stamp: 1162092159
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -41,9 +41,9 @@ Get:6 http://ftp.jp.debian.org etch/main po-debconf 1.0.6 [111kB]
 Get:7 http://ftp.jp.debian.org etch/main debhelper 5.0.40 [510kB]
 Get:8 http://ftp.jp.debian.org etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:9 http://ftp.jp.debian.org etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 2917kB in 19s (153kB/s)
+Fetched 2917kB in 1s (1655kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 12055 files and directories currently installed.)
+(Reading database ... 12057 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-4_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-4_amd64.deb) ...
@@ -83,16 +83,16 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 4s (21.8kB/s)
+Fetched 97.4kB in 0s (852kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12654 files and directories currently installed.)
+(Reading database ... 12656 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
 Setting up fakeroot (1.5.10) ...
 
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir1/dsh_0.25.7-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir1/dsh_0.25.7.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir1/dsh_0.25.7-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir1/dsh_0.25.7-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir1/dsh_0.25.7.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir1/dsh_0.25.7-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 gpg: new configuration file `/tmp/buildd/.gnupg/gpg.conf' created
@@ -421,7 +421,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
-Wed Oct 25 03:53:11 UTC 2006
+Sun Oct 29 03:23:19 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -491,7 +491,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
-Wed Oct 25 03:53:16 UTC 2006
+Sun Oct 29 03:23:24 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -605,7 +605,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Wed Oct 25 12:53:18 JST 2006
-pbuilder-time-stamp: 1161748398
+Current time: Sun Oct 29 12:23:26 JST 2006
+pbuilder-time-stamp: 1162092206
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir1/28867 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir1/14397 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
index 947d633..6277aec 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
@@ -2,10 +2,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Wed Oct 25 12:38:30 JST 2006
-pbuilder-time-stamp: 1161747510
+Current time: Sun Oct 29 12:16:21 JST 2006
+pbuilder-time-stamp: 1162091781
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -41,9 +41,9 @@ Get:6 http://ftp.jp.debian.org sid/main po-debconf 1.0.7 [106kB]
 Get:7 http://ftp.jp.debian.org sid/main debhelper 5.0.40 [510kB]
 Get:8 http://ftp.jp.debian.org sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:9 http://ftp.jp.debian.org sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3097kB in 17s (173kB/s)
+Fetched 3097kB in 2s (1494kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 12118 files and directories currently installed.)
+(Reading database ... 12117 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-4_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-4_amd64.deb) ...
@@ -83,16 +83,16 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (120kB/s)
+Fetched 97.4kB in 0s (1085kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12723 files and directories currently installed.)
+(Reading database ... 12722 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
 Setting up fakeroot (1.5.10) ...
 
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir1/dsh_0.25.7-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir1/dsh_0.25.7.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir1/dsh_0.25.7-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir1/dsh_0.25.7-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir1/dsh_0.25.7.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir1/dsh_0.25.7-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 gpg: new configuration file `/tmp/buildd/.gnupg/gpg.conf' created
@@ -421,7 +421,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
-Wed Oct 25 03:39:31 UTC 2006
+Sun Oct 29 03:17:17 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -491,13 +491,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
-Wed Oct 25 03:39:36 UTC 2006
+Sun Oct 29 03:17:22 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
 c: c
 dsh: Process terminated (before write).
-a: a
 b: b
 PASS: tests/segv-catcher.sh
 l w
@@ -604,7 +604,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Wed Oct 25 12:39:38 JST 2006
-pbuilder-time-stamp: 1161747578
+Current time: Sun Oct 29 12:17:24 JST 2006
+pbuilder-time-stamp: 1162091844
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir1/25496 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir1/10695 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-etch.log b/testsuite/cdebootstrap/pbuilder-create-etch.log
index d228c64..8f75150 100644
--- a/testsuite/cdebootstrap/pbuilder-create-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-create-etch.log
@@ -180,6 +180,14 @@ P: Retrieving net-tools
 P: Validating net-tools
 P: Retrieving ifupdown
 P: Validating ifupdown
+P: Retrieving libwrap0
+P: Validating libwrap0
+P: Retrieving update-inetd
+P: Validating update-inetd
+P: Retrieving tcpd
+P: Validating tcpd
+P: Retrieving openbsd-inetd
+P: Validating openbsd-inetd
 P: Retrieving info
 P: Validating info
 P: Retrieving mount
@@ -214,8 +222,6 @@ P: Retrieving libpopt0
 P: Validating libpopt0
 P: Retrieving libsigc++-1.2-5c2
 P: Validating libsigc++-1.2-5c2
-P: Retrieving libwrap0
-P: Validating libwrap0
 P: Retrieving logrotate
 P: Validating logrotate
 P: Retrieving man-db
@@ -232,10 +238,6 @@ P: Retrieving modutils
 P: Validating modutils
 P: Retrieving ncurses-base
 P: Validating ncurses-base
-P: Retrieving openbsd-inetd
-P: Validating openbsd-inetd
-P: Retrieving tcpd
-P: Validating tcpd
 P: Retrieving netbase
 P: Validating netbase
 P: Retrieving netcat
@@ -386,10 +388,10 @@ O: Selecting previously deselected package libpam0g.
 O: Unpacking libpam0g (from .../libpam0g_0.79-3.2_amd64.deb) ...
 P: Unpacking package libpam0g
 O: Selecting previously deselected package libsepol1.
-O: Unpacking libsepol1 (from .../libsepol1_1.12.26-2_amd64.deb) ...
+O: Unpacking libsepol1 (from .../libsepol1_1.14-1_amd64.deb) ...
 P: Unpacking package libsepol1
 O: Selecting previously deselected package libselinux1.
-O: Unpacking libselinux1 (from .../libselinux1_1.30.28-2_amd64.deb) ...
+O: Unpacking libselinux1 (from .../libselinux1_1.32-2_amd64.deb) ...
 P: Unpacking package libselinux1
 O: Selecting previously deselected package libcap1.
 O: Unpacking libcap1 (from .../libcap1_1.10-14_amd64.deb) ...
@@ -502,7 +504,7 @@ O: Selecting previously deselected package zlib1g.
 O: Unpacking zlib1g (from .../zlib1g_1.2.3-13_amd64.deb) ...
 P: Unpacking package zlib1g
 O: Selecting previously deselected package libncurses5.
-O: Unpacking libncurses5 (from .../libncurses5_5.5-3_amd64.deb) ...
+O: Unpacking libncurses5 (from .../libncurses5_5.5-5_amd64.deb) ...
 P: Unpacking package libncurses5
 O: Selecting previously deselected package makedev.
 O: Unpacking makedev (from .../makedev_2.3.1-83_all.deb) ...
@@ -529,11 +531,11 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking bash (from .../bootstrap/bash_3.1-5_amd64.deb) ...
 P: Unpacking package bash
 O: Selecting previously deselected package bsdutils.
-O: dpkg: regarding .../bsdutils_2.12r-11_amd64.deb containing bsdutils, pre-dependency problem:
+O: dpkg: regarding .../bsdutils_2.12r-12_amd64.deb containing bsdutils, pre-dependency problem:
 O:  bsdutils pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking bsdutils (from .../bsdutils_2.12r-11_amd64.deb) ...
+O: Unpacking bsdutils (from .../bsdutils_2.12r-12_amd64.deb) ...
 P: Unpacking package bsdutils
 O: Selecting previously deselected package sed.
 O: dpkg: regarding .../sed_4.1.5-1_amd64.deb containing sed, pre-dependency problem:
@@ -543,15 +545,15 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking sed (from .../sed_4.1.5-1_amd64.deb) ...
 P: Unpacking package sed
 O: Selecting previously deselected package ncurses-bin.
-O: dpkg: regarding .../ncurses-bin_5.5-3_amd64.deb containing ncurses-bin, pre-dependency problem:
+O: dpkg: regarding .../ncurses-bin_5.5-5_amd64.deb containing ncurses-bin, pre-dependency problem:
 O:  ncurses-bin pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../ncurses-bin_5.5-3_amd64.deb containing ncurses-bin, pre-dependency problem:
+O: dpkg: regarding .../ncurses-bin_5.5-5_amd64.deb containing ncurses-bin, pre-dependency problem:
 O:  ncurses-bin pre-depends on libncurses5 (>= 5.4-5)
 O:   libncurses5 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking ncurses-bin (from .../ncurses-bin_5.5-3_amd64.deb) ...
+O: Unpacking ncurses-bin (from .../ncurses-bin_5.5-5_amd64.deb) ...
 P: Unpacking package ncurses-bin
 O: Selecting previously deselected package lsb-base.
 O: Unpacking lsb-base (from .../lsb-base_3.1-15_all.deb) ...
@@ -652,19 +654,19 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking hostname (from .../hostname_2.92_amd64.deb) ...
 P: Unpacking package hostname
 O: Selecting previously deselected package mount.
-O: dpkg: regarding .../mount_2.12r-11_amd64.deb containing mount, pre-dependency problem:
+O: dpkg: regarding .../mount_2.12r-12_amd64.deb containing mount, pre-dependency problem:
 O:  mount pre-depends on libblkid1 (>= 1.37-1)
 O:   libblkid1 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../mount_2.12r-11_amd64.deb containing mount, pre-dependency problem:
+O: dpkg: regarding .../mount_2.12r-12_amd64.deb containing mount, pre-dependency problem:
 O:  mount pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../mount_2.12r-11_amd64.deb containing mount, pre-dependency problem:
+O: dpkg: regarding .../mount_2.12r-12_amd64.deb containing mount, pre-dependency problem:
 O:  mount pre-depends on libuuid1
 O:   libuuid1 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking mount (from .../mount_2.12r-11_amd64.deb) ...
+O: Unpacking mount (from .../mount_2.12r-12_amd64.deb) ...
 P: Unpacking package mount
 O: Selecting previously deselected package initscripts.
 O: Unpacking initscripts (from .../initscripts_2.86.ds1-20_amd64.deb) ...
@@ -687,7 +689,7 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking sysvinit (from .../sysvinit_2.86.ds1-20_amd64.deb) ...
 P: Unpacking package sysvinit
 O: Selecting previously deselected package ncurses-base.
-O: Unpacking ncurses-base (from .../ncurses-base_5.5-3_all.deb) ...
+O: Unpacking ncurses-base (from .../ncurses-base_5.5-5_all.deb) ...
 P: Unpacking package ncurses-base
 O: Selecting previously deselected package procps.
 O: Unpacking procps (from .../procps_3.2.7-3_amd64.deb) ...
@@ -700,27 +702,27 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking tar (from .../tar_1.15.91-2_amd64.deb) ...
 P: Unpacking package tar
 O: Selecting previously deselected package util-linux.
-O: dpkg: regarding .../util-linux_2.12r-11_amd64.deb containing util-linux, pre-dependency problem:
+O: dpkg: regarding .../util-linux_2.12r-12_amd64.deb containing util-linux, pre-dependency problem:
 O:  util-linux pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../util-linux_2.12r-11_amd64.deb containing util-linux, pre-dependency problem:
+O: dpkg: regarding .../util-linux_2.12r-12_amd64.deb containing util-linux, pre-dependency problem:
 O:  util-linux pre-depends on libncurses5 (>= 5.4-5)
 O:   libncurses5 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../util-linux_2.12r-11_amd64.deb containing util-linux, pre-dependency problem:
+O: dpkg: regarding .../util-linux_2.12r-12_amd64.deb containing util-linux, pre-dependency problem:
 O:  util-linux pre-depends on libslang2 (>= 2.0.6-3)
 O:   libslang2 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../util-linux_2.12r-11_amd64.deb containing util-linux, pre-dependency problem:
+O: dpkg: regarding .../util-linux_2.12r-12_amd64.deb containing util-linux, pre-dependency problem:
 O:  util-linux pre-depends on libuuid1
 O:   libuuid1 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../util-linux_2.12r-11_amd64.deb containing util-linux, pre-dependency problem:
+O: dpkg: regarding .../util-linux_2.12r-12_amd64.deb containing util-linux, pre-dependency problem:
 O:  util-linux pre-depends on zlib1g (>= 1:1.2.1)
 O:   zlib1g is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking util-linux (from .../util-linux_2.12r-11_amd64.deb) ...
+O: Unpacking util-linux (from .../util-linux_2.12r-12_amd64.deb) ...
 P: Unpacking package util-linux
 O: Setting up makedev (2.3.1-83) ...
 P: Configuring package makedev
@@ -764,12 +766,12 @@ O:
 O: Setting up libpam0g (0.79-3.2) ...
 P: Configuring package libpam0g
 O: 
-O: Setting up bsdutils (2.12r-11) ...
+O: Setting up bsdutils (2.12r-12) ...
 P: Configuring package bsdutils
 O: 
 O: Setting up perl-base (5.8.8-6.1) ...
 P: Configuring package perl-base
-O: Setting up libsepol1 (1.12.26-2) ...
+O: Setting up libsepol1 (1.14-1) ...
 P: Configuring package libsepol1
 O: init: 
 O: /dev/initctl: No such file or directory
@@ -785,7 +787,7 @@ P: Configuring package libgcc1
 O: 
 O: Setting up libtext-iconv-perl (1.4-3) ...
 P: Configuring package libtext-iconv-perl
-O: Setting up libncurses5 (5.5-3) ...
+O: Setting up libncurses5 (5.5-5) ...
 P: Configuring package libncurses5
 O: 
 O: Setting up libattr1 (2.4.32-1) ...
@@ -827,7 +829,7 @@ O: Setting up liblocale-gettext-perl (1.05-1) ...
 P: Configuring package liblocale-gettext-perl
 O: Setting up diff (2.8.1-11) ...
 P: Configuring package diff
-O: Setting up libselinux1 (1.30.28-2) ...
+O: Setting up libselinux1 (1.32-2) ...
 P: Configuring package libselinux1
 O: init: 
 O: /dev/initctl: No such file or directory
@@ -848,9 +850,9 @@ O:
 O: Setting up debianutils (2.17) ...
 P: Configuring package debianutils
 O: 
-O: Setting up ncurses-base (5.5-3) ...
+O: Setting up ncurses-base (5.5-5) ...
 P: Configuring package ncurses-base
-O: Setting up ncurses-bin (5.5-3) ...
+O: Setting up ncurses-bin (5.5-5) ...
 P: Configuring package ncurses-bin
 O: Setting up libpam-modules (0.79-3.2) ...
 P: Configuring package libpam-modules
@@ -879,7 +881,7 @@ P: Configuring package lsb-base
 O: Setting up procps (3.2.7-3) ...
 P: Configuring package procps
 O: 
-O: Setting up mount (2.12r-11) ...
+O: Setting up mount (2.12r-12) ...
 P: Configuring package mount
 O: 
 O: Setting up passwd (4.0.18.1-3) ...
@@ -889,7 +891,7 @@ O:
 O: Setting up initscripts (2.86.ds1-20) ...
 P: Configuring package initscripts
 O: 
-O: Setting up util-linux (2.12r-11) ...
+O: Setting up util-linux (2.12r-12) ...
 P: Configuring package util-linux
 O: 
 O: Setting up sysvinit (2.86.ds1-20) ...
@@ -905,7 +907,7 @@ P: Configuring package debconf
 O: 
 O: Selecting previously deselected package libbz2-1.0.
 O: (Reading database ... 
-O: 4761 files and directories currently installed.)
+O: 4760 files and directories currently installed.)
 O: Unpacking libbz2-1.0 (from .../libbz2-1.0_1.0.3-6_amd64.deb) ...
 P: Unpacking package libbz2-1.0
 O: Selecting previously deselected package libgpg-error0.
@@ -1022,7 +1024,7 @@ O:
 P: Configuring helper cdebootstrap-helper-apt
 O: Selecting previously deselected package cdebootstrap-helper-apt.
 O: (Reading database ... 
-O: 5188 files and directories currently installed.)
+O: 5187 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-apt (from /cdebootstrap-helper-apt.deb) ...
 O: Setting up cdebootstrap-helper-apt (1) ...
 O: Get:1 bootstrap: . Release.gpg [189B]
@@ -1047,8 +1049,8 @@ O:   klogd laptop-detect libconsole libdb4.4 libgdbm3 libldap-2.3-0 liblzo2-2
 O:   libncursesw5 libnewt0.52 libpopt0 libsigc++-1.2-5c2 libsigc++-2.0-0c2a
 O:   libssl0.9.8 libwrap0 logrotate man-db manpages module-init-tools modutils
 O:   nano net-tools netbase netcat openbsd-inetd sysklogd tasksel tasksel-data
-O:   tcpd traceroute vim-common vim-tiny wget whiptail
-O: 0 upgraded, 49 newly installed, 0 to remove and 0 not upgraded.
+O:   tcpd traceroute update-inetd vim-common vim-tiny wget whiptail
+O: 0 upgraded, 50 newly installed, 0 to remove and 0 not upgraded.
 O: Need to get 12.7MB of archives.
 O: After unpacking 40.6MB of additional disk space will be used.
 O: WARNING: The following packages cannot be authenticated!
@@ -1057,12 +1059,12 @@ O:   bsdmainutils cpio cron dhcp3-common dhcp3-client dmidecode ed gettext-base
 O:   groff-base net-tools ifupdown info iptables iputils-ping sysklogd klogd
 O:   laptop-detect libconsole libgdbm3 libssl0.9.8 libldap-2.3-0 liblzo2-2
 O:   libnewt0.52 libpopt0 libsigc++-1.2-5c2 libwrap0 logrotate man-db manpages
-O:   module-init-tools modutils nano openbsd-inetd tcpd netbase netcat
-O:   tasksel-data tasksel traceroute vim-common vim-tiny wget whiptail
+O:   module-init-tools modutils nano update-inetd tcpd openbsd-inetd netbase
+O:   netcat tasksel-data tasksel traceroute vim-common vim-tiny wget whiptail
 O: Authentication warning overridden.
 O: Selecting previously deselected package adduser.
 O: (Reading database ... 
-O: 5189 files and directories currently installed.)
+O: 5188 files and directories currently installed.)
 O: Unpacking adduser (from .../bootstrap/adduser_3.97_all.deb) ...
 P: Unpacking package adduser
 O: Selecting previously deselected package libdb4.4.
@@ -1072,7 +1074,7 @@ O: Selecting previously deselected package apt-utils.
 O: Unpacking apt-utils (from .../apt-utils_0.6.46.2_amd64.deb) ...
 P: Unpacking package apt-utils
 O: Selecting previously deselected package libncursesw5.
-O: Unpacking libncursesw5 (from .../libncursesw5_5.5-3_amd64.deb) ...
+O: Unpacking libncursesw5 (from .../libncursesw5_5.5-5_amd64.deb) ...
 P: Unpacking package libncursesw5
 O: Selecting previously deselected package libsigc++-2.0-0c2a.
 O: Unpacking libsigc++-2.0-0c2a (from .../libsigc++-2.0-0c2a_2.0.17-2_amd64.deb) ...
@@ -1177,14 +1179,17 @@ P: Unpacking package modutils
 O: Selecting previously deselected package nano.
 O: Unpacking nano (from .../nano_1.9.99pre2-1_amd64.deb) ...
 P: Unpacking package nano
-O: Selecting previously deselected package openbsd-inetd.
-O: Unpacking openbsd-inetd (from .../openbsd-inetd_0.20050402-2_amd64.deb) ...
-P: Unpacking package openbsd-inetd
+O: Selecting previously deselected package update-inetd.
+O: Unpacking update-inetd (from .../update-inetd_4.27_all.deb) ...
+P: Unpacking package update-inetd
 O: Selecting previously deselected package tcpd.
 O: Unpacking tcpd (from .../tcpd_7.6.dbs-11_amd64.deb) ...
 P: Unpacking package tcpd
+O: Selecting previously deselected package openbsd-inetd.
+O: Unpacking openbsd-inetd (from .../openbsd-inetd_0.20050402-3_amd64.deb) ...
+P: Unpacking package openbsd-inetd
 O: Selecting previously deselected package netbase.
-O: Unpacking netbase (from .../bootstrap/netbase_4.25_all.deb) ...
+O: Unpacking netbase (from .../bootstrap/netbase_4.27_all.deb) ...
 P: Unpacking package netbase
 O: Selecting previously deselected package netcat.
 O: Unpacking netcat (from .../netcat_1.10-32_amd64.deb) ...
@@ -1218,7 +1223,7 @@ P: Configuring package libdb4.4
 O: Setting up apt-utils (0.6.46.2) ...
 P: Configuring package apt-utils
 O: 
-O: Setting up libncursesw5 (5.5-3) ...
+O: Setting up libncursesw5 (5.5-5) ...
 P: Configuring package libncursesw5
 O: 
 O: Setting up libsigc++-2.0-0c2a (2.0.17-2) ...
@@ -1320,9 +1325,17 @@ O:
 O: Setting up nano (1.9.99pre2-1) ...
 P: Configuring package nano
 O: 
+O: Setting up update-inetd (4.27) ...
+P: Configuring package update-inetd
 O: Setting up tcpd (7.6.dbs-11) ...
 P: Configuring package tcpd
 O: 
+O: Setting up openbsd-inetd (0.20050402-3) ...
+P: Configuring package openbsd-inetd
+O: 
+O: Setting up netbase (4.27) ...
+P: Configuring package netbase
+O: 
 O: Setting up netcat (1.10-32) ...
 P: Configuring package netcat
 O: Setting up traceroute (1.4a12-20) ...
@@ -1339,8 +1352,6 @@ P: Configuring package wget
 O: 
 O: Setting up whiptail (0.52.2-7) ...
 P: Configuring package whiptail
-O: Setting up tasksel-data (2.56) ...
-P: Configuring package tasksel-data
 O: Setting up klogd (1.4.1-18) ...
 P: Configuring package klogd
 O: Stopping kernel log daemon: klogd
@@ -1349,29 +1360,25 @@ O:
 O: Setting up sysklogd (1.4.1-18) ...
 P: Configuring package sysklogd
 O: 
-O: Setting up netbase (4.25) ...
-P: Configuring package netbase
-O: 
-O: Setting up openbsd-inetd (0.20050402-2) ...
-P: Configuring package openbsd-inetd
-O: 
+O: Setting up tasksel-data (2.56) ...
+P: Configuring package tasksel-data
 O: Setting up tasksel (2.56) ...
 P: Configuring package tasksel
 O: 
 P: Deconfiguring helper cdebootstrap-helper-apt
 O: (Reading database ... 
-O: 7187 files and directories currently installed.)
+O: 7189 files and directories currently installed.)
 O: Removing cdebootstrap-helper-apt ...
 P: Deconfiguring helper cdebootstrap-helper-diverts
 O: (Reading database ... 
-O: 7186 files and directories currently installed.)
+O: 7188 files and directories currently installed.)
 O: Removing cdebootstrap-helper-diverts ...
 O: Purging configuration files for cdebootstrap-helper-diverts ...
 O: Removing `diversion of /sbin/start-stop-daemon to /sbin/start-stop-daemon.REAL by cdebootstrap-helper-diverts'
 O: Removing `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by cdebootstrap-helper-diverts'
 P: Deconfiguring helper cdebootstrap-helper-makedev
 O: (Reading database ... 
-O: 7184 files and directories currently installed.)
+O: 7186 files and directories currently installed.)
 O: Removing cdebootstrap-helper-makedev ...
 O: Reading package lists...
 O: 
@@ -1385,7 +1392,7 @@ umount: /proc/bus/usb: not found
 umount: /dev/shm: not mounted
 umount: /proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//10717/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//28323/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
@@ -1393,8 +1400,8 @@ Refreshing the base.tgz
  -> installing dummy policy-rc.d
 Get:1 http://ftp.jp.debian.org etch Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org etch Release [74.4kB]
-Get:3 http://ftp.jp.debian.org etch/main Packages [5401kB]
-Fetched 5475kB in 19s (287kB/s)
+Get:3 http://ftp.jp.debian.org etch/main Packages [5421kB]
+Fetched 5495kB in 2s (1851kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -1423,7 +1430,7 @@ Need to get 21.1MB of archives.
 After unpacking 86.1MB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main binutils 2.17-3 [2630kB]
 Get:2 http://ftp.jp.debian.org etch/main cpp-4.1 4.1.1-13 [2476kB]
-Get:3 http://ftp.jp.debian.org etch/main cpp 4:4.1.1-11 [10.1kB]
+Get:3 http://ftp.jp.debian.org etch/main cpp 4:4.1.1-13 [10.3kB]
 Get:4 http://ftp.jp.debian.org etch/main perl-modules 5.8.8-6.1 [2309kB]
 Get:5 http://ftp.jp.debian.org etch/main perl 5.8.8-6.1 [4233kB]
 Get:6 http://ftp.jp.debian.org etch/main patch 2.5.9-4 [98.7kB]
@@ -1431,21 +1438,21 @@ Get:7 http://ftp.jp.debian.org etch/main make 3.81-2 [390kB]
 Get:8 http://ftp.jp.debian.org etch/main dpkg-dev 1.13.22 [109kB]
 Get:9 http://ftp.jp.debian.org etch/main libssp0 4.1.1-13 [4962B]
 Get:10 http://ftp.jp.debian.org etch/main gcc-4.1 4.1.1-13 [463kB]
-Get:11 http://ftp.jp.debian.org etch/main gcc 4:4.1.1-11 [5050B]
+Get:11 http://ftp.jp.debian.org etch/main gcc 4:4.1.1-13 [5056B]
 Get:12 http://ftp.jp.debian.org etch/main linux-kernel-headers 2.6.18-3 [1872kB]
 Get:13 http://ftp.jp.debian.org etch/main libc6-dev 2.3.6.ds1-4 [2107kB]
 Get:14 http://ftp.jp.debian.org etch/main libstdc++6-4.1-dev 4.1.1-13 [1632kB]
 Get:15 http://ftp.jp.debian.org etch/main g++-4.1 4.1.1-13 [2780kB]
-Get:16 http://ftp.jp.debian.org etch/main g++ 4:4.1.1-11 [1358B]
+Get:16 http://ftp.jp.debian.org etch/main g++ 4:4.1.1-13 [1362B]
 Get:17 http://ftp.jp.debian.org etch/main build-essential 11.3 [6982B]
-Fetched 21.1MB in 1m42s (205kB/s)
+Fetched 21.1MB in 13s (1587kB/s)
 Selecting previously deselected package binutils.
-(Reading database ... 7184 files and directories currently installed.)
+(Reading database ... 7186 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.17-3_amd64.deb) ...
 Selecting previously deselected package cpp-4.1.
 Unpacking cpp-4.1 (from .../cpp-4.1_4.1.1-13_amd64.deb) ...
 Selecting previously deselected package cpp.
-Unpacking cpp (from .../cpp_4%3a4.1.1-11_amd64.deb) ...
+Unpacking cpp (from .../cpp_4%3a4.1.1-13_amd64.deb) ...
 Selecting previously deselected package perl-modules.
 Unpacking perl-modules (from .../perl-modules_5.8.8-6.1_all.deb) ...
 Selecting previously deselected package perl.
@@ -1461,7 +1468,7 @@ Unpacking libssp0 (from .../libssp0_4.1.1-13_amd64.deb) ...
 Selecting previously deselected package gcc-4.1.
 Unpacking gcc-4.1 (from .../gcc-4.1_4.1.1-13_amd64.deb) ...
 Selecting previously deselected package gcc.
-Unpacking gcc (from .../gcc_4%3a4.1.1-11_amd64.deb) ...
+Unpacking gcc (from .../gcc_4%3a4.1.1-13_amd64.deb) ...
 Selecting previously deselected package linux-kernel-headers.
 Unpacking linux-kernel-headers (from .../linux-kernel-headers_2.6.18-3_amd64.deb) ...
 Selecting previously deselected package libc6-dev.
@@ -1471,20 +1478,20 @@ Unpacking libstdc++6-4.1-dev (from .../libstdc++6-4.1-dev_4.1.1-13_amd64.deb) ..
 Selecting previously deselected package g++-4.1.
 Unpacking g++-4.1 (from .../g++-4.1_4.1.1-13_amd64.deb) ...
 Selecting previously deselected package g++.
-Unpacking g++ (from .../g++_4%3a4.1.1-11_amd64.deb) ...
+Unpacking g++ (from .../g++_4%3a4.1.1-13_amd64.deb) ...
 Selecting previously deselected package build-essential.
 Unpacking build-essential (from .../build-essential_11.3_amd64.deb) ...
 Setting up binutils (2.17-3) ...
 
 Setting up cpp-4.1 (4.1.1-13) ...
-Setting up cpp (4.1.1-11) ...
+Setting up cpp (4.1.1-13) ...
 
 Setting up patch (2.5.9-4) ...
 Setting up make (3.81-2) ...
 Setting up libssp0 (4.1.1-13) ...
 
 Setting up gcc-4.1 (4.1.1-13) ...
-Setting up gcc (4.1.1-11) ...
+Setting up gcc (4.1.1-13) ...
 
 Setting up linux-kernel-headers (2.6.18-3) ...
 Setting up libc6-dev (2.3.6.ds1-4) ...
@@ -1494,7 +1501,7 @@ Setting up perl (5.8.8-6.1) ...
 
 Setting up dpkg-dev (1.13.22) ...
 Setting up g++-4.1 (4.1.1-13) ...
-Setting up g++ (4.1.1-11) ...
+Setting up g++ (4.1.1-13) ...
 
 Setting up build-essential (11.3) ...
 umount: /sys: not mounted
@@ -1504,9 +1511,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: not found
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//10717/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//28323/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//10717 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//28323 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-sid.log b/testsuite/cdebootstrap/pbuilder-create-sid.log
index 7dca3e7..51a8f7b 100644
--- a/testsuite/cdebootstrap/pbuilder-create-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-create-sid.log
@@ -485,23 +485,23 @@ O: Selecting previously deselected package libtext-wrapi18n-perl.
 O: Unpacking libtext-wrapi18n-perl (from .../libtext-wrapi18n-perl_0.06-5_all.deb) ...
 P: Unpacking package libtext-wrapi18n-perl
 O: Selecting previously deselected package debconf.
-O: dpkg: regarding .../debconf_1.5.6_all.deb containing debconf, pre-dependency problem:
+O: dpkg: regarding .../debconf_1.5.7_all.deb containing debconf, pre-dependency problem:
 O:  debconf pre-depends on perl-base (>= 5.6.1-4)
 O:   perl-base is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking debconf (from .../debconf_1.5.6_all.deb) ...
+O: Unpacking debconf (from .../debconf_1.5.7_all.deb) ...
 P: Unpacking package debconf
 O: Selecting previously deselected package debconf-i18n.
-O: Unpacking debconf-i18n (from .../debconf-i18n_1.5.6_all.deb) ...
+O: Unpacking debconf-i18n (from .../debconf-i18n_1.5.7_all.deb) ...
 P: Unpacking package debconf-i18n
 O: Selecting previously deselected package gcc-4.1-base.
-O: Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1.1-17_amd64.deb) ...
+O: Unpacking gcc-4.1-base (from .../gcc-4.1-base_4.1.1-18_amd64.deb) ...
 P: Unpacking package gcc-4.1-base
 O: Selecting previously deselected package libgcc1.
-O: Unpacking libgcc1 (from .../libgcc1_4.1.1-17_amd64.deb) ...
+O: Unpacking libgcc1 (from .../libgcc1_4.1.1-18_amd64.deb) ...
 P: Unpacking package libgcc1
 O: Selecting previously deselected package libstdc++6.
-O: Unpacking libstdc++6 (from .../libstdc++6_4.1.1-17_amd64.deb) ...
+O: Unpacking libstdc++6 (from .../libstdc++6_4.1.1-18_amd64.deb) ...
 P: Unpacking package libstdc++6
 O: Selecting previously deselected package zlib1g.
 O: Unpacking zlib1g (from .../zlib1g_1.2.3-13_amd64.deb) ...
@@ -534,11 +534,11 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking bash (from .../bash_3.1dfsg-7_amd64.deb) ...
 P: Unpacking package bash
 O: Selecting previously deselected package bsdutils.
-O: dpkg: regarding .../bsdutils_2.12r-11_amd64.deb containing bsdutils, pre-dependency problem:
+O: dpkg: regarding .../bsdutils_2.12r-12_amd64.deb containing bsdutils, pre-dependency problem:
 O:  bsdutils pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking bsdutils (from .../bsdutils_2.12r-11_amd64.deb) ...
+O: Unpacking bsdutils (from .../bsdutils_2.12r-12_amd64.deb) ...
 P: Unpacking package bsdutils
 O: Selecting previously deselected package sed.
 O: dpkg: regarding .../sed_4.1.5-1_amd64.deb containing sed, pre-dependency problem:
@@ -559,7 +559,7 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking ncurses-bin (from .../ncurses-bin_5.5-5_amd64.deb) ...
 P: Unpacking package ncurses-bin
 O: Selecting previously deselected package lsb-base.
-O: Unpacking lsb-base (from .../lsb-base_3.1-17_all.deb) ...
+O: Unpacking lsb-base (from .../lsb-base_3.1-18_all.deb) ...
 P: Unpacking package lsb-base
 O: Selecting previously deselected package diff.
 O: dpkg: regarding .../diff_2.8.1-11_amd64.deb containing diff, pre-dependency problem:
@@ -645,19 +645,19 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking hostname (from .../hostname_2.92_amd64.deb) ...
 P: Unpacking package hostname
 O: Selecting previously deselected package mount.
-O: dpkg: regarding .../mount_2.12r-11_amd64.deb containing mount, pre-dependency problem:
+O: dpkg: regarding .../mount_2.12r-12_amd64.deb containing mount, pre-dependency problem:
 O:  mount pre-depends on libblkid1 (>= 1.37-1)
 O:   libblkid1 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../mount_2.12r-11_amd64.deb containing mount, pre-dependency problem:
+O: dpkg: regarding .../mount_2.12r-12_amd64.deb containing mount, pre-dependency problem:
 O:  mount pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../mount_2.12r-11_amd64.deb containing mount, pre-dependency problem:
+O: dpkg: regarding .../mount_2.12r-12_amd64.deb containing mount, pre-dependency problem:
 O:  mount pre-depends on libuuid1
 O:   libuuid1 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking mount (from .../mount_2.12r-11_amd64.deb) ...
+O: Unpacking mount (from .../mount_2.12r-12_amd64.deb) ...
 P: Unpacking package mount
 O: Selecting previously deselected package sysvinit-utils.
 O: Unpacking sysvinit-utils (from .../sysvinit-utils_2.86.ds1-33_amd64.deb) ...
@@ -693,34 +693,34 @@ O: Selecting previously deselected package procps.
 O: Unpacking procps (from .../procps_3.2.7-3_amd64.deb) ...
 P: Unpacking package procps
 O: Selecting previously deselected package tar.
-O: dpkg: regarding .../tar_1.15.91-2.1_amd64.deb containing tar, pre-dependency problem:
+O: dpkg: regarding .../bootstrap/tar_1.16-1_amd64.deb containing tar, pre-dependency problem:
 O:  tar pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking tar (from .../tar_1.15.91-2.1_amd64.deb) ...
+O: Unpacking tar (from .../bootstrap/tar_1.16-1_amd64.deb) ...
 P: Unpacking package tar
 O: Selecting previously deselected package util-linux.
-O: dpkg: regarding .../util-linux_2.12r-11_amd64.deb containing util-linux, pre-dependency problem:
+O: dpkg: regarding .../util-linux_2.12r-12_amd64.deb containing util-linux, pre-dependency problem:
 O:  util-linux pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../util-linux_2.12r-11_amd64.deb containing util-linux, pre-dependency problem:
+O: dpkg: regarding .../util-linux_2.12r-12_amd64.deb containing util-linux, pre-dependency problem:
 O:  util-linux pre-depends on libncurses5 (>= 5.4-5)
 O:   libncurses5 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../util-linux_2.12r-11_amd64.deb containing util-linux, pre-dependency problem:
+O: dpkg: regarding .../util-linux_2.12r-12_amd64.deb containing util-linux, pre-dependency problem:
 O:  util-linux pre-depends on libslang2 (>= 2.0.6-3)
 O:   libslang2 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../util-linux_2.12r-11_amd64.deb containing util-linux, pre-dependency problem:
+O: dpkg: regarding .../util-linux_2.12r-12_amd64.deb containing util-linux, pre-dependency problem:
 O:  util-linux pre-depends on libuuid1
 O:   libuuid1 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../util-linux_2.12r-11_amd64.deb containing util-linux, pre-dependency problem:
+O: dpkg: regarding .../util-linux_2.12r-12_amd64.deb containing util-linux, pre-dependency problem:
 O:  util-linux pre-depends on zlib1g (>= 1:1.2.1)
 O:   zlib1g is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking util-linux (from .../util-linux_2.12r-11_amd64.deb) ...
+O: Unpacking util-linux (from .../util-linux_2.12r-12_amd64.deb) ...
 P: Unpacking package util-linux
 O: Setting up makedev (2.3.1-83) ...
 P: Configuring package makedev
@@ -732,7 +732,7 @@ O: Setting up tzdata (2006n-1) ...
 P: Configuring package tzdata
 O: Non-interactive mode, setting timezone to UTC.  Run tzconfig to change.
 O: 
-O: Setting up gcc-4.1-base (4.1.1-17) ...
+O: Setting up gcc-4.1-base (4.1.1-18) ...
 P: Configuring package gcc-4.1-base
 O: 
 O: Setting up libpam-runtime (0.79-4) ...
@@ -764,7 +764,7 @@ O:
 O: Setting up libpam0g (0.79-4) ...
 P: Configuring package libpam0g
 O: 
-O: Setting up bsdutils (2.12r-11) ...
+O: Setting up bsdutils (2.12r-12) ...
 P: Configuring package bsdutils
 O: 
 O: Setting up perl-base (5.8.8-6.1) ...
@@ -774,13 +774,13 @@ P: Configuring package libsepol1
 O: init: 
 O: /dev/initctl: No such file or directory
 O: 
-O: Setting up tar (1.15.91-2.1) ...
+O: Setting up tar (1.16-1) ...
 P: Configuring package tar
 O: 
 O: Setting up zlib1g (1.2.3-13) ...
 P: Configuring package zlib1g
 O: 
-O: Setting up libgcc1 (4.1.1-17) ...
+O: Setting up libgcc1 (4.1.1-18) ...
 P: Configuring package libgcc1
 O: 
 O: Setting up libtext-iconv-perl (1.4-3) ...
@@ -832,7 +832,7 @@ P: Configuring package libselinux1
 O: init: 
 O: /dev/initctl: No such file or directory
 O: 
-O: Setting up libstdc++6 (4.1.1-17) ...
+O: Setting up libstdc++6 (4.1.1-18) ...
 P: Configuring package libstdc++6
 O: 
 O: Setting up libdevmapper1.02 (1.02.08-1) ...
@@ -876,12 +876,12 @@ O:
 O: Setting up login (4.0.18.1-5) ...
 P: Configuring package login
 O: 
-O: Setting up lsb-base (3.1-17) ...
+O: Setting up lsb-base (3.1-18) ...
 P: Configuring package lsb-base
 O: Setting up procps (3.2.7-3) ...
 P: Configuring package procps
 O: 
-O: Setting up mount (2.12r-11) ...
+O: Setting up mount (2.12r-12) ...
 P: Configuring package mount
 O: 
 O: Setting up passwd (4.0.18.1-5) ...
@@ -891,7 +891,7 @@ O:
 O: Setting up initscripts (2.86.ds1-33) ...
 P: Configuring package initscripts
 O: 
-O: Setting up util-linux (2.12r-11) ...
+O: Setting up util-linux (2.12r-12) ...
 P: Configuring package util-linux
 O: 
 O: Setting up sysvinit (2.86.ds1-33) ...
@@ -900,14 +900,14 @@ O: sysvinit: creating /dev/initctl
 O: init: 
 O: timeout opening/writing control channel /dev/initctl
 O: 
-O: Setting up debconf-i18n (1.5.6) ...
+O: Setting up debconf-i18n (1.5.7) ...
 P: Configuring package debconf-i18n
-O: Setting up debconf (1.5.6) ...
+O: Setting up debconf (1.5.7) ...
 P: Configuring package debconf
 O: 
 O: Selecting previously deselected package libbz2-1.0.
 O: (Reading database ... 
-O: 4790 files and directories currently installed.)
+O: 4792 files and directories currently installed.)
 O: Unpacking libbz2-1.0 (from .../libbz2-1.0_1.0.3-6_amd64.deb) ...
 P: Unpacking package libbz2-1.0
 O: Selecting previously deselected package libgpg-error0.
@@ -1023,8 +1023,7 @@ P: Configuring package apt
 O: 
 P: Configuring helper cdebootstrap-helper-apt
 O: Selecting previously deselected package cdebootstrap-helper-apt.
-O: (Reading database ... 
-O: 5217 files and directories currently installed.)
+O: (Reading database ... 5219 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-apt (from /cdebootstrap-helper-apt.deb) ...
 O: Setting up cdebootstrap-helper-apt (1) ...
 O: Get:1 bootstrap: . Release.gpg [189B]
@@ -1050,8 +1049,8 @@ O:   libssl0.9.8 libwrap0 logrotate man-db manpages module-init-tools modutils
 O:   nano net-tools netbase netcat openbsd-inetd sysklogd tasksel tasksel-data
 O:   tcpd traceroute update-inetd vim-common vim-tiny wget whiptail
 O: 0 upgraded, 50 newly installed, 0 to remove and 0 not upgraded.
-O: Need to get 12.8MB of archives.
-O: After unpacking 40.7MB of additional disk space will be used.
+O: Need to get 12.9MB of archives.
+O: After unpacking 40.9MB of additional disk space will be used.
 O: WARNING: The following packages cannot be authenticated!
 O:   adduser libdb4.4 apt-utils libncursesw5 libsigc++-2.0-0c2a aptitude
 O:   bsdmainutils cpio cron dhcp3-common dhcp3-client dmidecode ed gettext-base
@@ -1063,7 +1062,7 @@ O:   netcat tasksel-data tasksel traceroute vim-common vim-tiny wget whiptail
 O: Authentication warning overridden.
 O: Selecting previously deselected package adduser.
 O: (Reading database ... 
-O: 5218 files and directories currently installed.)
+O: 5220 files and directories currently installed.)
 O: Unpacking adduser (from .../bootstrap/adduser_3.99_all.deb) ...
 P: Unpacking package adduser
 O: Selecting previously deselected package libdb4.4.
@@ -1079,7 +1078,7 @@ O: Selecting previously deselected package libsigc++-2.0-0c2a.
 O: Unpacking libsigc++-2.0-0c2a (from .../libsigc++-2.0-0c2a_2.0.17-2_amd64.deb) ...
 P: Unpacking package libsigc++-2.0-0c2a
 O: Selecting previously deselected package aptitude.
-O: Unpacking aptitude (from .../aptitude_0.4.3-1_amd64.deb) ...
+O: Unpacking aptitude (from .../aptitude_0.4.4-1_amd64.deb) ...
 P: Unpacking package aptitude
 O: Selecting previously deselected package bsdmainutils.
 O: Unpacking bsdmainutils (from .../bsdmainutils_6.1.4_amd64.deb) ...
@@ -1176,7 +1175,7 @@ O: Selecting previously deselected package modutils.
 O: Unpacking modutils (from .../modutils_2.4.27.0-6_amd64.deb) ...
 P: Unpacking package modutils
 O: Selecting previously deselected package nano.
-O: Unpacking nano (from .../nano_1.9.99pre2-1_amd64.deb) ...
+O: Unpacking nano (from .../nano_1.9.99pre3-1_amd64.deb) ...
 P: Unpacking package nano
 O: Selecting previously deselected package update-inetd.
 O: Unpacking update-inetd (from .../update-inetd_4.27_all.deb) ...
@@ -1203,10 +1202,10 @@ O: Selecting previously deselected package traceroute.
 O: Unpacking traceroute (from .../traceroute_1.4a12-20_amd64.deb) ...
 P: Unpacking package traceroute
 O: Selecting previously deselected package vim-common.
-O: Unpacking vim-common (from .../vim-common_7.0-122+1_amd64.deb) ...
+O: Unpacking vim-common (from .../vim-common_7.0-152+1_amd64.deb) ...
 P: Unpacking package vim-common
 O: Selecting previously deselected package vim-tiny.
-O: Unpacking vim-tiny (from .../vim-tiny_7.0-122+1_amd64.deb) ...
+O: Unpacking vim-tiny (from .../vim-tiny_7.0-152+1_amd64.deb) ...
 P: Unpacking package vim-tiny
 O: Selecting previously deselected package wget.
 O: Unpacking wget (from .../wget_1.10.2-2_amd64.deb) ...
@@ -1228,7 +1227,7 @@ O:
 O: Setting up libsigc++-2.0-0c2a (2.0.17-2) ...
 P: Configuring package libsigc++-2.0-0c2a
 O: 
-O: Setting up aptitude (0.4.3-1) ...
+O: Setting up aptitude (0.4.4-1) ...
 P: Configuring package aptitude
 O: 
 O: Setting up bsdmainutils (6.1.4) ...
@@ -1317,7 +1316,7 @@ O: Setting up modutils (2.4.27.0-6) ...
 P: Configuring package modutils
 O: Architecture-specific modutils configuration for x86_64 not found, using defaults
 O: 
-O: Setting up nano (1.9.99pre2-1) ...
+O: Setting up nano (1.9.99pre3-1) ...
 P: Configuring package nano
 O: 
 O: Setting up update-inetd (4.27) ...
@@ -1336,10 +1335,10 @@ P: Configuring package netcat
 O: Setting up traceroute (1.4a12-20) ...
 P: Configuring package traceroute
 O: 
-O: Setting up vim-common (7.0-122+1) ...
+O: Setting up vim-common (7.0-152+1) ...
 P: Configuring package vim-common
 O: 
-O: Setting up vim-tiny (7.0-122+1) ...
+O: Setting up vim-tiny (7.0-152+1) ...
 P: Configuring package vim-tiny
 O: 
 O: Setting up wget (1.10.2-2) ...
@@ -1360,18 +1359,18 @@ P: Configuring package tasksel
 O: 
 P: Deconfiguring helper cdebootstrap-helper-apt
 O: (Reading database ... 
-O: 7225 files and directories currently installed.)
+O: 7224 files and directories currently installed.)
 O: Removing cdebootstrap-helper-apt ...
 P: Deconfiguring helper cdebootstrap-helper-diverts
 O: (Reading database ... 
-O: 7224 files and directories currently installed.)
+O: 7223 files and directories currently installed.)
 O: Removing cdebootstrap-helper-diverts ...
 O: Purging configuration files for cdebootstrap-helper-diverts ...
 O: Removing `diversion of /sbin/start-stop-daemon to /sbin/start-stop-daemon.REAL by cdebootstrap-helper-diverts'
 O: Removing `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by cdebootstrap-helper-diverts'
 P: Deconfiguring helper cdebootstrap-helper-makedev
 O: (Reading database ... 
-O: 7222 files and directories currently installed.)
+O: 7221 files and directories currently installed.)
 O: Removing cdebootstrap-helper-makedev ...
 O: Reading package lists...
 O: 
@@ -1384,7 +1383,7 @@ umount: /proc/bus/usb: not found
 umount: /dev/shm: not mounted
 umount: /proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//7295/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//24556/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
@@ -1392,8 +1391,8 @@ Refreshing the base.tgz
  -> installing dummy policy-rc.d
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org sid Release [79.6kB]
-Get:3 http://ftp.jp.debian.org sid/main Packages [5666kB]
-Fetched 5745kB in 22s (252kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [5688kB]
+Fetched 5767kB in 2s (2008kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -1420,28 +1419,28 @@ The following NEW packages will be installed:
 Need to get 21.2MB of archives.
 After unpacking 86.4MB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main binutils 2.17-3 [2630kB]
-Get:2 http://ftp.jp.debian.org sid/main cpp-4.1 4.1.1-17 [2480kB]
+Get:2 http://ftp.jp.debian.org sid/main cpp-4.1 4.1.1-18 [2480kB]
 Get:3 http://ftp.jp.debian.org sid/main cpp 4:4.1.1-13 [10.3kB]
 Get:4 http://ftp.jp.debian.org sid/main perl-modules 5.8.8-6.1 [2309kB]
 Get:5 http://ftp.jp.debian.org sid/main perl 5.8.8-6.1 [4233kB]
 Get:6 http://ftp.jp.debian.org sid/main patch 2.5.9-4 [98.7kB]
 Get:7 http://ftp.jp.debian.org sid/main make 3.81-3 [395kB]
 Get:8 http://ftp.jp.debian.org sid/main dpkg-dev 1.13.24 [164kB]
-Get:9 http://ftp.jp.debian.org sid/main libssp0 4.1.1-17 [4970B]
-Get:10 http://ftp.jp.debian.org sid/main gcc-4.1 4.1.1-17 [468kB]
+Get:9 http://ftp.jp.debian.org sid/main libssp0 4.1.1-18 [4972B]
+Get:10 http://ftp.jp.debian.org sid/main gcc-4.1 4.1.1-18 [469kB]
 Get:11 http://ftp.jp.debian.org sid/main gcc 4:4.1.1-13 [5056B]
-Get:12 http://ftp.jp.debian.org sid/main linux-kernel-headers 2.6.18-5 [1872kB]
+Get:12 http://ftp.jp.debian.org sid/main linux-kernel-headers 2.6.18-6 [1872kB]
 Get:13 http://ftp.jp.debian.org sid/main libc6-dev 2.3.6.ds1-7 [2108kB]
-Get:14 http://ftp.jp.debian.org sid/main libstdc++6-4.1-dev 4.1.1-17 [1619kB]
-Get:15 http://ftp.jp.debian.org sid/main g++-4.1 4.1.1-17 [2785kB]
+Get:14 http://ftp.jp.debian.org sid/main libstdc++6-4.1-dev 4.1.1-18 [1619kB]
+Get:15 http://ftp.jp.debian.org sid/main g++-4.1 4.1.1-18 [2785kB]
 Get:16 http://ftp.jp.debian.org sid/main g++ 4:4.1.1-13 [1362B]
 Get:17 http://ftp.jp.debian.org sid/main build-essential 11.3 [6982B]
-Fetched 21.2MB in 1m28s (240kB/s)
+Fetched 21.2MB in 9s (2303kB/s)
 Selecting previously deselected package binutils.
-(Reading database ... 7222 files and directories currently installed.)
+(Reading database ... 7221 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.17-3_amd64.deb) ...
 Selecting previously deselected package cpp-4.1.
-Unpacking cpp-4.1 (from .../cpp-4.1_4.1.1-17_amd64.deb) ...
+Unpacking cpp-4.1 (from .../cpp-4.1_4.1.1-18_amd64.deb) ...
 Selecting previously deselected package cpp.
 Unpacking cpp (from .../cpp_4%3a4.1.1-13_amd64.deb) ...
 Selecting previously deselected package perl-modules.
@@ -1455,43 +1454,43 @@ Unpacking make (from .../archives/make_3.81-3_amd64.deb) ...
 Selecting previously deselected package dpkg-dev.
 Unpacking dpkg-dev (from .../dpkg-dev_1.13.24_all.deb) ...
 Selecting previously deselected package libssp0.
-Unpacking libssp0 (from .../libssp0_4.1.1-17_amd64.deb) ...
+Unpacking libssp0 (from .../libssp0_4.1.1-18_amd64.deb) ...
 Selecting previously deselected package gcc-4.1.
-Unpacking gcc-4.1 (from .../gcc-4.1_4.1.1-17_amd64.deb) ...
+Unpacking gcc-4.1 (from .../gcc-4.1_4.1.1-18_amd64.deb) ...
 Selecting previously deselected package gcc.
 Unpacking gcc (from .../gcc_4%3a4.1.1-13_amd64.deb) ...
 Selecting previously deselected package linux-kernel-headers.
-Unpacking linux-kernel-headers (from .../linux-kernel-headers_2.6.18-5_amd64.deb) ...
+Unpacking linux-kernel-headers (from .../linux-kernel-headers_2.6.18-6_amd64.deb) ...
 Selecting previously deselected package libc6-dev.
 Unpacking libc6-dev (from .../libc6-dev_2.3.6.ds1-7_amd64.deb) ...
 Selecting previously deselected package libstdc++6-4.1-dev.
-Unpacking libstdc++6-4.1-dev (from .../libstdc++6-4.1-dev_4.1.1-17_amd64.deb) ...
+Unpacking libstdc++6-4.1-dev (from .../libstdc++6-4.1-dev_4.1.1-18_amd64.deb) ...
 Selecting previously deselected package g++-4.1.
-Unpacking g++-4.1 (from .../g++-4.1_4.1.1-17_amd64.deb) ...
+Unpacking g++-4.1 (from .../g++-4.1_4.1.1-18_amd64.deb) ...
 Selecting previously deselected package g++.
 Unpacking g++ (from .../g++_4%3a4.1.1-13_amd64.deb) ...
 Selecting previously deselected package build-essential.
 Unpacking build-essential (from .../build-essential_11.3_amd64.deb) ...
 Setting up binutils (2.17-3) ...
 
-Setting up cpp-4.1 (4.1.1-17) ...
+Setting up cpp-4.1 (4.1.1-18) ...
 Setting up cpp (4.1.1-13) ...
 
 Setting up patch (2.5.9-4) ...
 Setting up make (3.81-3) ...
-Setting up libssp0 (4.1.1-17) ...
+Setting up libssp0 (4.1.1-18) ...
 
-Setting up gcc-4.1 (4.1.1-17) ...
+Setting up gcc-4.1 (4.1.1-18) ...
 Setting up gcc (4.1.1-13) ...
 
-Setting up linux-kernel-headers (2.6.18-5) ...
+Setting up linux-kernel-headers (2.6.18-6) ...
 Setting up libc6-dev (2.3.6.ds1-7) ...
 Setting up perl-modules (5.8.8-6.1) ...
-Setting up libstdc++6-4.1-dev (4.1.1-17) ...
+Setting up libstdc++6-4.1-dev (4.1.1-18) ...
 Setting up perl (5.8.8-6.1) ...
 
 Setting up dpkg-dev (1.13.24) ...
-Setting up g++-4.1 (4.1.1-17) ...
+Setting up g++-4.1 (4.1.1-18) ...
 Setting up g++ (4.1.1-13) ...
 
 Setting up build-essential (11.3) ...
@@ -1501,9 +1500,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//7295/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//24556/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//7295 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//24556 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-etch.log b/testsuite/cdebootstrap/pbuilder-execute-etch.log
index 13dd290..3bb3bb3 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/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/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//14040 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//31975 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-sid.log b/testsuite/cdebootstrap/pbuilder-execute-sid.log
index ccdae5a..8d1ee41 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/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/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//10662 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//28266 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
index 4556e67..705e3c5 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/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -15,8 +15,8 @@ Get:2 http://ftp.jp.debian.org experimental Release.gpg [189B]
 Hit http://ftp.jp.debian.org sid Release
 Get:3 http://ftp.jp.debian.org experimental Release [79.3kB]
 Get:4 http://ftp.jp.debian.org sid/main Packages/DiffIndex [2038B]
-Get:5 http://ftp.jp.debian.org experimental/main Packages [156kB]
-Fetched 238kB in 27s (8687B/s)
+Get:5 http://ftp.jp.debian.org experimental/main Packages [158kB]
+Fetched 240kB in 0s (317kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -38,13 +38,13 @@ Get:5 http://ftp.jp.debian.org experimental/main libgcc1 1:4.2-20061003-1 [25.9k
 Get:6 http://ftp.jp.debian.org experimental/main libstdc++6 4.2-20061003-1 [293kB]
 Get:7 http://ftp.jp.debian.org experimental/main libgnutls13 1.5.1.cvs20060930-1 [310kB]
 Get:8 http://ftp.jp.debian.org experimental/main wget 1.10.2+1.11.beta1-1 [635kB]
-Fetched 11.6MB in 1m3s (184kB/s)
-(Reading database ... 12118 files and directories currently installed.)
+Fetched 11.6MB in 6s (1814kB/s)
+(Reading database ... 12117 files and directories currently installed.)
 Preparing to replace coreutils 5.97-5.1 (using .../coreutils_6.0-1_amd64.deb) ...
 Unpacking replacement coreutils ...
 Setting up coreutils (6.0-1) ...
 
-(Reading database ... 12130 files and directories currently installed.)
+(Reading database ... 12129 files and directories currently installed.)
 Preparing to replace libc6-dev 2.3.6.ds1-7 (using .../libc6-dev_2.5-0exp2_amd64.deb) ...
 Unpacking replacement libc6-dev ...
 Preparing to replace libc6 2.3.6.ds1-7 (using .../libc6_2.5-0exp2_amd64.deb) ...
@@ -54,20 +54,20 @@ Installing new version of config file /etc/init.d/glibc.sh ...
 init: timeout opening/writing control channel /dev/initctl
 
 Selecting previously deselected package gcc-4.2-base.
-(Reading database ... 12192 files and directories currently installed.)
+(Reading database ... 12191 files and directories currently installed.)
 Unpacking gcc-4.2-base (from .../gcc-4.2-base_4.2-20061003-1_amd64.deb) ...
-Preparing to replace libgcc1 1:4.1.1-17 (using .../libgcc1_1%3a4.2-20061003-1_amd64.deb) ...
+Preparing to replace libgcc1 1:4.1.1-18 (using .../libgcc1_1%3a4.2-20061003-1_amd64.deb) ...
 Unpacking replacement libgcc1 ...
 Setting up gcc-4.2-base (4.2-20061003-1) ...
 
 Setting up libgcc1 (4.2-20061003-1) ...
 
-(Reading database ... 12198 files and directories currently installed.)
-Preparing to replace libstdc++6 4.1.1-17 (using .../libstdc++6_4.2-20061003-1_amd64.deb) ...
+(Reading database ... 12197 files and directories currently installed.)
+Preparing to replace libstdc++6 4.1.1-18 (using .../libstdc++6_4.2-20061003-1_amd64.deb) ...
 Unpacking replacement libstdc++6 ...
 Setting up libstdc++6 (4.2-20061003-1) ...
 
-(Reading database ... 12198 files and directories currently installed.)
+(Reading database ... 12197 files and directories currently installed.)
 Preparing to replace libgnutls13 1.4.4-2 (using .../libgnutls13_1.5.1.cvs20060930-1_amd64.deb) ...
 Unpacking replacement libgnutls13 ...
 Preparing to replace wget 1.10.2-2 (using .../wget_1.10.2+1.11.beta1-1_amd64.deb) ...
@@ -90,9 +90,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//15493/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//848/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//15493 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//848 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
index 686d8ee..6e790e4 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/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -11,106 +11,109 @@ Refreshing the base.tgz
  -> upgrading packages
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org sid Release [79.6kB]
-Get:3 http://ftp.jp.debian.org sid/main Packages [5666kB]
-Fetched 5745kB in 1m2s (92.0kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [5688kB]
+Fetched 5767kB in 5s (982kB/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:
-  sysvinit-utils update-inetd
+  sysvinit-utils
 The following packages will be upgraded:
-  adduser bash coreutils cpp cpp-4.1 cron debianutils dhcp3-client
-  dhcp3-common dpkg dpkg-dev dselect e2fslibs e2fsprogs g++ g++-4.1 gcc
-  gcc-4.1 gcc-4.1-base gettext-base grep ifupdown initscripts iputils-ping
-  klogd libblkid1 libc6 libc6-dev libcomerr2 libgcc1 libgnutls13 libncurses5
-  libncursesw5 libnewt0.52 libopencdk8 libpam-modules libpam-runtime libpam0g
-  libselinux1 libsepol1 libss2 libssp0 libstdc++6 libstdc++6-4.1-dev
-  libtasn1-3 libuuid1 linux-kernel-headers login lsb-base make man-db
-  ncurses-base ncurses-bin netbase openbsd-inetd passwd sysklogd sysv-rc
-  sysvinit tar tasksel tasksel-data tzdata whiptail
-64 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
-Need to get 31.2MB of archives.
-After unpacking 1630kB of additional disk space will be used.
+  adduser aptitude bash coreutils cpp-4.1 cron debconf debconf-i18n
+  debianutils dhcp3-client dhcp3-common dpkg dpkg-dev dselect e2fslibs
+  e2fsprogs g++-4.1 gcc-4.1 gcc-4.1-base gettext-base grep ifupdown
+  initscripts iputils-ping klogd libblkid1 libc6 libc6-dev libcomerr2 libgcc1
+  libgnutls13 libnewt0.52 libopencdk8 libpam-modules libpam-runtime libpam0g
+  libss2 libssp0 libstdc++6 libstdc++6-4.1-dev libtasn1-3 libuuid1
+  linux-kernel-headers login lsb-base make man-db nano passwd sysklogd sysv-rc
+  sysvinit tar tasksel tasksel-data tzdata vim-common vim-tiny whiptail
+59 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Need to get 34.7MB of archives.
+After unpacking 2064kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main debianutils 2.17.3 [52.2kB]
 Get:2 http://ftp.jp.debian.org sid/main bash 3.1dfsg-7 [910kB]
-Get:3 http://ftp.jp.debian.org sid/main linux-kernel-headers 2.6.18-5 [1872kB]
-Get:4 http://ftp.jp.debian.org sid/main libc6-dev 2.3.6.ds1-7 [2108kB]
-Get:5 http://ftp.jp.debian.org sid/main tzdata 2006n-1 [315kB]
-Get:6 http://ftp.jp.debian.org sid/main libc6 2.3.6.ds1-7 [4074kB]
-Get:7 http://ftp.jp.debian.org sid/main libsepol1 1.14-1 [124kB]
-Get:8 http://ftp.jp.debian.org sid/main libselinux1 1.32-2 [62.8kB]
-Get:9 http://ftp.jp.debian.org sid/main coreutils 5.97-5.1 [3200kB]
-Get:10 http://ftp.jp.debian.org sid/main dpkg 1.13.24 [1973kB]
-Get:11 http://ftp.jp.debian.org sid/main e2fslibs 1.39+1.40-WIP-2006.10.02+dfsg-2 [89.6kB]
-Get:12 http://ftp.jp.debian.org sid/main e2fsprogs 1.39+1.40-WIP-2006.10.02+dfsg-2 [606kB]
-Get:13 http://ftp.jp.debian.org sid/main grep 2.5.1.ds2-6 [150kB]
-Get:14 http://ftp.jp.debian.org sid/main libpam-runtime 0.79-4 [64.3kB]
-Get:15 http://ftp.jp.debian.org sid/main libpam0g 0.79-4 [81.9kB]
-Get:16 http://ftp.jp.debian.org sid/main libpam-modules 0.79-4 [199kB]
-Get:17 http://ftp.jp.debian.org sid/main login 1:4.0.18.1-5 [804kB]
-Get:18 http://ftp.jp.debian.org sid/main ncurses-bin 5.5-5 [228kB]
-Get:19 http://ftp.jp.debian.org sid/main sysvinit-utils 2.86.ds1-33 [66.1kB]
-Get:20 http://ftp.jp.debian.org sid/main sysvinit 2.86.ds1-33 [113kB]
-Get:21 http://ftp.jp.debian.org sid/main tar 1.15.91-2.1 [611kB]
-Get:22 http://ftp.jp.debian.org sid/main libncurses5 5.5-5 [324kB]
-Get:23 http://ftp.jp.debian.org sid/main ncurses-base 5.5-5 [13.0kB]
-Get:24 http://ftp.jp.debian.org sid/main lsb-base 3.1-17 [15.7kB]
-Get:25 http://ftp.jp.debian.org sid/main initscripts 2.86.ds1-33 [58.4kB]
-Get:26 http://ftp.jp.debian.org sid/main libblkid1 1.39+1.40-WIP-2006.10.02+dfsg-2 [44.0kB]
-Get:27 http://ftp.jp.debian.org sid/main libcomerr2 1.39+1.40-WIP-2006.10.02+dfsg-2 [31.2kB]
-Get:28 http://ftp.jp.debian.org sid/main cpp-4.1 4.1.1-17 [2480kB]
-Get:29 http://ftp.jp.debian.org sid/main gcc-4.1-base 4.1.1-17 [198kB]
-Get:30 http://ftp.jp.debian.org sid/main libgcc1 1:4.1.1-17 [24.6kB]
-Get:31 http://ftp.jp.debian.org sid/main gcc-4.1 4.1.1-17 [468kB]
-Get:32 http://ftp.jp.debian.org sid/main g++-4.1 4.1.1-17 [2785kB]
-Get:33 http://ftp.jp.debian.org sid/main libstdc++6-4.1-dev 4.1.1-17 [1619kB]
-Get:34 http://ftp.jp.debian.org sid/main libssp0 4.1.1-17 [4970B]
-Get:35 http://ftp.jp.debian.org sid/main libstdc++6 4.1.1-17 [288kB]
-Get:36 http://ftp.jp.debian.org sid/main libss2 1.39+1.40-WIP-2006.10.02+dfsg-2 [37.8kB]
-Get:37 http://ftp.jp.debian.org sid/main libuuid1 1.39+1.40-WIP-2006.10.02+dfsg-2 [32.9kB]
-Get:38 http://ftp.jp.debian.org sid/main sysv-rc 2.86.ds1-33 [56.2kB]
-Get:39 http://ftp.jp.debian.org sid/main passwd 1:4.0.18.1-5 [855kB]
-Get:40 http://ftp.jp.debian.org sid/main adduser 3.99 [175kB]
-Get:41 http://ftp.jp.debian.org sid/main cron 3.0pl1-99 [82.5kB]
-Get:42 http://ftp.jp.debian.org sid/main dhcp3-client 3.0.4-10 [218kB]
-Get:43 http://ftp.jp.debian.org sid/main dhcp3-common 3.0.4-10 [287kB]
-Get:44 http://ftp.jp.debian.org sid/main gettext-base 0.15-2 [127kB]
-Get:45 http://ftp.jp.debian.org sid/main ifupdown 0.6.8 [51.6kB]
-Get:46 http://ftp.jp.debian.org sid/main iputils-ping 3:20020927-3.1 [44.2kB]
-Get:47 http://ftp.jp.debian.org sid/main sysklogd 1.4.1-20 [60.2kB]
-Get:48 http://ftp.jp.debian.org sid/main klogd 1.4.1-20 [40.7kB]
-Get:49 http://ftp.jp.debian.org sid/main libopencdk8 0.5.9-2 [102kB]
-Get:50 http://ftp.jp.debian.org sid/main libtasn1-3 0.3.6-2 [55.7kB]
-Get:51 http://ftp.jp.debian.org sid/main libgnutls13 1.4.4-2 [316kB]
-Get:52 http://ftp.jp.debian.org sid/main libncursesw5 5.5-5 [344kB]
-Get:53 http://ftp.jp.debian.org sid/main libnewt0.52 0.52.2-8 [68.2kB]
-Get:54 http://ftp.jp.debian.org sid/main man-db 2.4.3-4 [711kB]
-Get:55 http://ftp.jp.debian.org sid/main openbsd-inetd 0.20050402-3 [36.1kB]
-Get:56 http://ftp.jp.debian.org sid/main netbase 4.27 [36.3kB]
-Get:57 http://ftp.jp.debian.org sid/main update-inetd 4.27 [9678B]
-Get:58 http://ftp.jp.debian.org sid/main tasksel-data 2.57 [231kB]
-Get:59 http://ftp.jp.debian.org sid/main tasksel 2.57 [65.8kB]
-Get:60 http://ftp.jp.debian.org sid/main whiptail 0.52.2-8 [35.3kB]
-Get:61 http://ftp.jp.debian.org sid/main dselect 1.13.24 [533kB]
-Get:62 http://ftp.jp.debian.org sid/main cpp 4:4.1.1-13 [10.3kB]
-Get:63 http://ftp.jp.debian.org sid/main make 3.81-3 [395kB]
-Get:64 http://ftp.jp.debian.org sid/main dpkg-dev 1.13.24 [164kB]
-Get:65 http://ftp.jp.debian.org sid/main gcc 4:4.1.1-13 [5056B]
-Get:66 http://ftp.jp.debian.org sid/main g++ 4:4.1.1-13 [1362B]
-Fetched 31.2MB in 3m30s (149kB/s)
-(Reading database ... 12055 files and directories currently installed.)
+Get:3 http://ftp.jp.debian.org sid/main coreutils 5.97-5.1 [3200kB]
+Get:4 http://ftp.jp.debian.org sid/main dpkg 1.13.24 [1973kB]
+Get:5 http://ftp.jp.debian.org sid/main linux-kernel-headers 2.6.18-6 [1872kB]
+Get:6 http://ftp.jp.debian.org sid/main libc6-dev 2.3.6.ds1-7 [2108kB]
+Get:7 http://ftp.jp.debian.org sid/main tzdata 2006n-1 [315kB]
+Get:8 http://ftp.jp.debian.org sid/main libc6 2.3.6.ds1-7 [4074kB]
+Get:9 http://ftp.jp.debian.org sid/main e2fslibs 1.39+1.40-WIP-2006.10.02+dfsg-2 [89.6kB]
+Get:10 http://ftp.jp.debian.org sid/main e2fsprogs 1.39+1.40-WIP-2006.10.02+dfsg-2 [606kB]
+Get:11 http://ftp.jp.debian.org sid/main grep 2.5.1.ds2-6 [150kB]
+Get:12 http://ftp.jp.debian.org sid/main libpam-runtime 0.79-4 [64.3kB]
+Get:13 http://ftp.jp.debian.org sid/main libpam0g 0.79-4 [81.9kB]
+Get:14 http://ftp.jp.debian.org sid/main libpam-modules 0.79-4 [199kB]
+Get:15 http://ftp.jp.debian.org sid/main login 1:4.0.18.1-5 [804kB]
+Get:16 http://ftp.jp.debian.org sid/main sysvinit-utils 2.86.ds1-33 [66.1kB]
+Get:17 http://ftp.jp.debian.org sid/main sysvinit 2.86.ds1-33 [113kB]
+Get:18 http://ftp.jp.debian.org sid/main tar 1.16-1 [711kB]
+Get:19 http://ftp.jp.debian.org sid/main debconf-i18n 1.5.7 [150kB]
+Get:20 http://ftp.jp.debian.org sid/main debconf 1.5.7 [143kB]
+Get:21 http://ftp.jp.debian.org sid/main lsb-base 3.1-18 [15.8kB]
+Get:22 http://ftp.jp.debian.org sid/main initscripts 2.86.ds1-33 [58.4kB]
+Get:23 http://ftp.jp.debian.org sid/main libblkid1 1.39+1.40-WIP-2006.10.02+dfsg-2 [44.0kB]
+Get:24 http://ftp.jp.debian.org sid/main libcomerr2 1.39+1.40-WIP-2006.10.02+dfsg-2 [31.2kB]
+Get:25 http://ftp.jp.debian.org sid/main cpp-4.1 4.1.1-18 [2480kB]
+Get:26 http://ftp.jp.debian.org sid/main gcc-4.1-base 4.1.1-18 [198kB]
+Get:27 http://ftp.jp.debian.org sid/main libgcc1 1:4.1.1-18 [24.6kB]
+Get:28 http://ftp.jp.debian.org sid/main gcc-4.1 4.1.1-18 [469kB]
+Get:29 http://ftp.jp.debian.org sid/main g++-4.1 4.1.1-18 [2785kB]
+Get:30 http://ftp.jp.debian.org sid/main libstdc++6-4.1-dev 4.1.1-18 [1619kB]
+Get:31 http://ftp.jp.debian.org sid/main libssp0 4.1.1-18 [4972B]
+Get:32 http://ftp.jp.debian.org sid/main libstdc++6 4.1.1-18 [288kB]
+Get:33 http://ftp.jp.debian.org sid/main libss2 1.39+1.40-WIP-2006.10.02+dfsg-2 [37.8kB]
+Get:34 http://ftp.jp.debian.org sid/main libuuid1 1.39+1.40-WIP-2006.10.02+dfsg-2 [32.9kB]
+Get:35 http://ftp.jp.debian.org sid/main sysv-rc 2.86.ds1-33 [56.2kB]
+Get:36 http://ftp.jp.debian.org sid/main passwd 1:4.0.18.1-5 [855kB]
+Get:37 http://ftp.jp.debian.org sid/main adduser 3.99 [175kB]
+Get:38 http://ftp.jp.debian.org sid/main aptitude 0.4.4-1 [2877kB]
+Get:39 http://ftp.jp.debian.org sid/main cron 3.0pl1-99 [82.5kB]
+Get:40 http://ftp.jp.debian.org sid/main dhcp3-client 3.0.4-10 [218kB]
+Get:41 http://ftp.jp.debian.org sid/main dhcp3-common 3.0.4-10 [287kB]
+Get:42 http://ftp.jp.debian.org sid/main gettext-base 0.15-2 [127kB]
+Get:43 http://ftp.jp.debian.org sid/main ifupdown 0.6.8 [51.6kB]
+Get:44 http://ftp.jp.debian.org sid/main iputils-ping 3:20020927-3.1 [44.2kB]
+Get:45 http://ftp.jp.debian.org sid/main sysklogd 1.4.1-20 [60.2kB]
+Get:46 http://ftp.jp.debian.org sid/main klogd 1.4.1-20 [40.7kB]
+Get:47 http://ftp.jp.debian.org sid/main libopencdk8 0.5.9-2 [102kB]
+Get:48 http://ftp.jp.debian.org sid/main libtasn1-3 0.3.6-2 [55.7kB]
+Get:49 http://ftp.jp.debian.org sid/main libgnutls13 1.4.4-2 [316kB]
+Get:50 http://ftp.jp.debian.org sid/main libnewt0.52 0.52.2-8 [68.2kB]
+Get:51 http://ftp.jp.debian.org sid/main man-db 2.4.3-4 [711kB]
+Get:52 http://ftp.jp.debian.org sid/main nano 1.9.99pre3-1 [551kB]
+Get:53 http://ftp.jp.debian.org sid/main tasksel-data 2.57 [231kB]
+Get:54 http://ftp.jp.debian.org sid/main tasksel 2.57 [65.8kB]
+Get:55 http://ftp.jp.debian.org sid/main vim-tiny 1:7.0-152+1 [615kB]
+Get:56 http://ftp.jp.debian.org sid/main vim-common 1:7.0-152+1 [231kB]
+Get:57 http://ftp.jp.debian.org sid/main whiptail 0.52.2-8 [35.3kB]
+Get:58 http://ftp.jp.debian.org sid/main dselect 1.13.24 [533kB]
+Get:59 http://ftp.jp.debian.org sid/main make 3.81-3 [395kB]
+Get:60 http://ftp.jp.debian.org sid/main dpkg-dev 1.13.24 [164kB]
+Fetched 34.7MB in 27s (1245kB/s)
+(Reading database ... 12057 files and directories currently installed.)
 Preparing to replace debianutils 2.17 (using .../debianutils_2.17.3_amd64.deb) ...
 Unpacking replacement debianutils ...
 Setting up debianutils (2.17.3) ...
 
-(Reading database ... 12055 files and directories currently installed.)
+(Reading database ... 12057 files and directories currently installed.)
 Preparing to replace bash 3.1-5 (using .../bash_3.1dfsg-7_amd64.deb) ...
 Unpacking replacement bash ...
 Setting up bash (3.1dfsg-7) ...
 
-(Reading database ... 12054 files and directories currently installed.)
-Preparing to replace linux-kernel-headers 2.6.18-3 (using .../linux-kernel-headers_2.6.18-5_amd64.deb) ...
+(Reading database ... 12056 files and directories currently installed.)
+Preparing to replace coreutils 5.97-5 (using .../coreutils_5.97-5.1_amd64.deb) ...
+Unpacking replacement coreutils ...
+Setting up coreutils (5.97-5.1) ...
+
+(Reading database ... 12056 files and directories currently installed.)
+Preparing to replace dpkg 1.13.22 (using .../dpkg_1.13.24_amd64.deb) ...
+Unpacking replacement dpkg ...
+Setting up dpkg (1.13.24) ...
+
+(Reading database ... 12075 files and directories currently installed.)
+Preparing to replace linux-kernel-headers 2.6.18-3 (using .../linux-kernel-headers_2.6.18-6_amd64.deb) ...
 Unpacking replacement linux-kernel-headers ...
 Preparing to replace libc6-dev 2.3.6.ds1-4 (using .../libc6-dev_2.3.6.ds1-7_amd64.deb) ...
 Unpacking replacement libc6-dev ...
@@ -120,104 +123,73 @@ Preparing to replace libc6 2.3.6.ds1-4 (using .../libc6_2.3.6.ds1-7_amd64.deb) .
 Unpacking replacement libc6 ...
 Setting up tzdata (2006n-1) ...
 Current default timezone: 'UTC'.
-Local time is now:      Wed Oct 25 04:00:18 UTC 2006.
-Universal Time is now:  Wed Oct 25 04:00:18 UTC 2006.
+Local time is now:      Sun Oct 29 03:26:40 UTC 2006.
+Universal Time is now:  Sun Oct 29 03:26:40 UTC 2006.
 Run 'tzconfig' if you wish to change it.
 
 Setting up libc6 (2.3.6.ds1-7) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 12057 files and directories currently installed.)
-Preparing to replace libsepol1 1.12.26-2 (using .../libsepol1_1.14-1_amd64.deb) ...
-Unpacking replacement libsepol1 ...
-Setting up libsepol1 (1.14-1) ...
-init: timeout opening/writing control channel /dev/initctl
-
-(Reading database ... 12057 files and directories currently installed.)
-Preparing to replace libselinux1 1.30.28-2 (using .../libselinux1_1.32-2_amd64.deb) ...
-Unpacking replacement libselinux1 ...
-Setting up libselinux1 (1.32-2) ...
-init: timeout opening/writing control channel /dev/initctl
-
-(Reading database ... 12057 files and directories currently installed.)
-Preparing to replace coreutils 5.97-5 (using .../coreutils_5.97-5.1_amd64.deb) ...
-Unpacking replacement coreutils ...
-Setting up coreutils (5.97-5.1) ...
-
-(Reading database ... 12057 files and directories currently installed.)
-Preparing to replace dpkg 1.13.22 (using .../dpkg_1.13.24_amd64.deb) ...
-Unpacking replacement dpkg ...
-Setting up dpkg (1.13.24) ...
-
-(Reading database ... 12076 files and directories currently installed.)
+(Reading database ... 12078 files and directories currently installed.)
 Preparing to replace e2fslibs 1.39-1 (using .../e2fslibs_1.39+1.40-WIP-2006.10.02+dfsg-2_amd64.deb) ...
 Unpacking replacement e2fslibs ...
 Setting up e2fslibs (1.39+1.40-WIP-2006.10.02+dfsg-2) ...
 
-(Reading database ... 12076 files and directories currently installed.)
+(Reading database ... 12078 files and directories currently installed.)
 Preparing to replace e2fsprogs 1.39-1 (using .../e2fsprogs_1.39+1.40-WIP-2006.10.02+dfsg-2_amd64.deb) ...
 Unpacking replacement e2fsprogs ...
 Setting up e2fsprogs (1.39+1.40-WIP-2006.10.02+dfsg-2) ...
-(Reading database ... 12077 files and directories currently installed.)
+(Reading database ... 12079 files and directories currently installed.)
 Preparing to replace grep 2.5.1.ds2-5 (using .../grep_2.5.1.ds2-6_amd64.deb) ...
 Unpacking replacement grep ...
 Setting up grep (2.5.1.ds2-6) ...
 
-(Reading database ... 12077 files and directories currently installed.)
+(Reading database ... 12079 files and directories currently installed.)
 Preparing to replace libpam-runtime 0.79-3.2 (using .../libpam-runtime_0.79-4_all.deb) ...
 Unpacking replacement libpam-runtime ...
 Setting up libpam-runtime (0.79-4) ...
 
-(Reading database ... 12077 files and directories currently installed.)
+(Reading database ... 12079 files and directories currently installed.)
 Preparing to replace libpam0g 0.79-3.2 (using .../libpam0g_0.79-4_amd64.deb) ...
 Unpacking replacement libpam0g ...
 Setting up libpam0g (0.79-4) ...
 
-(Reading database ... 12077 files and directories currently installed.)
+(Reading database ... 12079 files and directories currently installed.)
 Preparing to replace libpam-modules 0.79-3.2 (using .../libpam-modules_0.79-4_amd64.deb) ...
 Unpacking replacement libpam-modules ...
 Setting up libpam-modules (0.79-4) ...
 Installing new version of config file /etc/security/limits.conf ...
 
-(Reading database ... 12077 files and directories currently installed.)
+(Reading database ... 12079 files and directories currently installed.)
 Preparing to replace login 1:4.0.18.1-3 (using .../login_1%3a4.0.18.1-5_amd64.deb) ...
 Unpacking replacement login ...
 Setting up login (4.0.18.1-5) ...
 
-(Reading database ... 12077 files and directories currently installed.)
-Preparing to replace ncurses-bin 5.5-3 (using .../ncurses-bin_5.5-5_amd64.deb) ...
-Unpacking replacement ncurses-bin ...
-Setting up ncurses-bin (5.5-5) ...
 Selecting previously deselected package sysvinit-utils.
-(Reading database ... 12077 files and directories currently installed.)
+(Reading database ... 12079 files and directories currently installed.)
 Unpacking sysvinit-utils (from .../sysvinit-utils_2.86.ds1-33_amd64.deb) ...
 Replacing files in old package sysvinit ...
 Setting up sysvinit-utils (2.86.ds1-33) ...
-(Reading database ... 12081 files and directories currently installed.)
+(Reading database ... 12083 files and directories currently installed.)
 Preparing to replace sysvinit 2.86.ds1-20 (using .../sysvinit_2.86.ds1-33_amd64.deb) ...
 Unpacking replacement sysvinit ...
 Setting up sysvinit (2.86.ds1-33) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 12081 files and directories currently installed.)
-Preparing to replace tar 1.15.91-2 (using .../tar_1.15.91-2.1_amd64.deb) ...
+(Reading database ... 12083 files and directories currently installed.)
+Preparing to replace tar 1.15.91-2 (using .../archives/tar_1.16-1_amd64.deb) ...
 Unpacking replacement tar ...
-Setting up tar (1.15.91-2.1) ...
-
-(Reading database ... 12081 files and directories currently installed.)
-Preparing to replace libncurses5 5.5-3 (using .../libncurses5_5.5-5_amd64.deb) ...
-Unpacking replacement libncurses5 ...
-Setting up libncurses5 (5.5-5) ...
-
-(Reading database ... 12081 files and directories currently installed.)
-Preparing to replace ncurses-base 5.5-3 (using .../ncurses-base_5.5-5_all.deb) ...
-Unpacking replacement ncurses-base ...
-Setting up ncurses-base (5.5-5) ...
-(Reading database ... 12081 files and directories currently installed.)
-Preparing to replace lsb-base 3.1-15 (using .../lsb-base_3.1-17_all.deb) ...
+Setting up tar (1.16-1) ...
+
+(Reading database ... 12083 files and directories currently installed.)
+Preparing to replace debconf-i18n 1.5.6 (using .../debconf-i18n_1.5.7_all.deb) ...
+Unpacking replacement debconf-i18n ...
+Preparing to replace debconf 1.5.6 (using .../archives/debconf_1.5.7_all.deb) ...
+Unpacking replacement debconf ...
+Preparing to replace lsb-base 3.1-15 (using .../lsb-base_3.1-18_all.deb) ...
 Unpacking replacement lsb-base ...
-Setting up lsb-base (3.1-17) ...
-(Reading database ... 12081 files and directories currently installed.)
+Setting up lsb-base (3.1-18) ...
+(Reading database ... 12084 files and directories currently installed.)
 Preparing to replace initscripts 2.86.ds1-20 (using .../initscripts_2.86.ds1-33_amd64.deb) ...
 Unpacking replacement initscripts ...
 Setting up initscripts (2.86.ds1-33) ...
@@ -243,60 +215,62 @@ Installing new version of config file /etc/init.d/umountnfs.sh ...
 Installing new version of config file /etc/init.d/umountroot ...
 Installing new version of config file /etc/init.d/urandom ...
 
-(Reading database ... 12082 files and directories currently installed.)
+(Reading database ... 12085 files and directories currently installed.)
 Preparing to replace libblkid1 1.39-1 (using .../libblkid1_1.39+1.40-WIP-2006.10.02+dfsg-2_amd64.deb) ...
 Unpacking replacement libblkid1 ...
 Setting up libblkid1 (1.39+1.40-WIP-2006.10.02+dfsg-2) ...
 
-(Reading database ... 12082 files and directories currently installed.)
+(Reading database ... 12085 files and directories currently installed.)
 Preparing to replace libcomerr2 1.39-1 (using .../libcomerr2_1.39+1.40-WIP-2006.10.02+dfsg-2_amd64.deb) ...
 Unpacking replacement libcomerr2 ...
 Setting up libcomerr2 (1.39+1.40-WIP-2006.10.02+dfsg-2) ...
 
-(Reading database ... 12082 files and directories currently installed.)
-Preparing to replace cpp-4.1 4.1.1-13 (using .../cpp-4.1_4.1.1-17_amd64.deb) ...
+(Reading database ... 12085 files and directories currently installed.)
+Preparing to replace cpp-4.1 4.1.1-13 (using .../cpp-4.1_4.1.1-18_amd64.deb) ...
 Unpacking replacement cpp-4.1 ...
-Preparing to replace gcc-4.1-base 4.1.1-13 (using .../gcc-4.1-base_4.1.1-17_amd64.deb) ...
+Preparing to replace gcc-4.1-base 4.1.1-13 (using .../gcc-4.1-base_4.1.1-18_amd64.deb) ...
 Unpacking replacement gcc-4.1-base ...
-Preparing to replace libgcc1 1:4.1.1-13 (using .../libgcc1_1%3a4.1.1-17_amd64.deb) ...
+Preparing to replace libgcc1 1:4.1.1-13 (using .../libgcc1_1%3a4.1.1-18_amd64.deb) ...
 Unpacking replacement libgcc1 ...
-Setting up gcc-4.1-base (4.1.1-17) ...
+Setting up gcc-4.1-base (4.1.1-18) ...
 
-Setting up libgcc1 (4.1.1-17) ...
+Setting up libgcc1 (4.1.1-18) ...
 
-(Reading database ... 12082 files and directories currently installed.)
-Preparing to replace gcc-4.1 4.1.1-13 (using .../gcc-4.1_4.1.1-17_amd64.deb) ...
+(Reading database ... 12085 files and directories currently installed.)
+Preparing to replace gcc-4.1 4.1.1-13 (using .../gcc-4.1_4.1.1-18_amd64.deb) ...
 Unpacking replacement gcc-4.1 ...
-Preparing to replace g++-4.1 4.1.1-13 (using .../g++-4.1_4.1.1-17_amd64.deb) ...
+Preparing to replace g++-4.1 4.1.1-13 (using .../g++-4.1_4.1.1-18_amd64.deb) ...
 Unpacking replacement g++-4.1 ...
-Preparing to replace libstdc++6-4.1-dev 4.1.1-13 (using .../libstdc++6-4.1-dev_4.1.1-17_amd64.deb) ...
+Preparing to replace libstdc++6-4.1-dev 4.1.1-13 (using .../libstdc++6-4.1-dev_4.1.1-18_amd64.deb) ...
 Unpacking replacement libstdc++6-4.1-dev ...
-Preparing to replace libssp0 4.1.1-13 (using .../libssp0_4.1.1-17_amd64.deb) ...
+Preparing to replace libssp0 4.1.1-13 (using .../libssp0_4.1.1-18_amd64.deb) ...
 Unpacking replacement libssp0 ...
-Preparing to replace libstdc++6 4.1.1-13 (using .../libstdc++6_4.1.1-17_amd64.deb) ...
+Preparing to replace libstdc++6 4.1.1-13 (using .../libstdc++6_4.1.1-18_amd64.deb) ...
 Unpacking replacement libstdc++6 ...
-Setting up libstdc++6 (4.1.1-17) ...
+Setting up libstdc++6 (4.1.1-18) ...
 
-(Reading database ... 12086 files and directories currently installed.)
+(Reading database ... 12089 files and directories currently installed.)
 Preparing to replace libss2 1.39-1 (using .../libss2_1.39+1.40-WIP-2006.10.02+dfsg-2_amd64.deb) ...
 Unpacking replacement libss2 ...
 Setting up libss2 (1.39+1.40-WIP-2006.10.02+dfsg-2) ...
 
-(Reading database ... 12086 files and directories currently installed.)
+(Reading database ... 12089 files and directories currently installed.)
 Preparing to replace libuuid1 1.39-1 (using .../libuuid1_1.39+1.40-WIP-2006.10.02+dfsg-2_amd64.deb) ...
 Unpacking replacement libuuid1 ...
 Setting up libuuid1 (1.39+1.40-WIP-2006.10.02+dfsg-2) ...
 
-(Reading database ... 12086 files and directories currently installed.)
+(Reading database ... 12089 files and directories currently installed.)
 Preparing to replace sysv-rc 2.86.ds1-20 (using .../sysv-rc_2.86.ds1-33_all.deb) ...
 Unpacking replacement sysv-rc ...
 Setting up sysv-rc (2.86.ds1-33) ...
 
-(Reading database ... 12086 files and directories currently installed.)
+(Reading database ... 12089 files and directories currently installed.)
 Preparing to replace passwd 1:4.0.18.1-3 (using .../passwd_1%3a4.0.18.1-5_amd64.deb) ...
 Unpacking replacement passwd ...
 Preparing to replace adduser 3.97 (using .../archives/adduser_3.99_all.deb) ...
 Unpacking replacement adduser ...
+Preparing to replace aptitude 0.4.3-1 (using .../aptitude_0.4.4-1_amd64.deb) ...
+Unpacking replacement aptitude ...
 Preparing to replace cron 3.0pl1-97 (using .../cron_3.0pl1-99_amd64.deb) ...
 Unpacking replacement cron ...
 Preparing to replace dhcp3-client 3.0.4-8 (using .../dhcp3-client_3.0.4-10_amd64.deb) ...
@@ -319,61 +293,41 @@ Preparing to replace libtasn1-3 0.3.6-1 (using .../libtasn1-3_0.3.6-2_amd64.deb)
 Unpacking replacement libtasn1-3 ...
 Preparing to replace libgnutls13 1.4.4-1 (using .../libgnutls13_1.4.4-2_amd64.deb) ...
 Unpacking replacement libgnutls13 ...
-Preparing to replace libncursesw5 5.5-3 (using .../libncursesw5_5.5-5_amd64.deb) ...
-Unpacking replacement libncursesw5 ...
 Preparing to replace libnewt0.52 0.52.2-7 (using .../libnewt0.52_0.52.2-8_amd64.deb) ...
 Unpacking replacement libnewt0.52 ...
 Preparing to replace man-db 2.4.3-3 (using .../man-db_2.4.3-4_amd64.deb) ...
 Unpacking replacement man-db ...
-Preparing to replace openbsd-inetd 0.20050402-2 (using .../openbsd-inetd_0.20050402-3_amd64.deb) ...
-Unpacking replacement openbsd-inetd ...
-Preparing to replace netbase 4.25 (using .../archives/netbase_4.27_all.deb) ...
-Unpacking replacement netbase ...
-Selecting previously deselected package update-inetd.
-Unpacking update-inetd (from .../update-inetd_4.27_all.deb) ...
+Preparing to replace nano 1.9.99pre2-1 (using .../nano_1.9.99pre3-1_amd64.deb) ...
+Unpacking replacement nano ...
 Preparing to replace tasksel-data 2.56 (using .../tasksel-data_2.57_all.deb) ...
 Unpacking replacement tasksel-data ...
 Preparing to replace tasksel 2.56 (using .../archives/tasksel_2.57_all.deb) ...
 Unpacking replacement tasksel ...
+Preparing to replace vim-tiny 1:7.0-122+1 (using .../vim-tiny_1%3a7.0-152+1_amd64.deb) ...
+Unpacking replacement vim-tiny ...
+Preparing to replace vim-common 1:7.0-122+1 (using .../vim-common_1%3a7.0-152+1_amd64.deb) ...
+Unpacking replacement vim-common ...
 Preparing to replace whiptail 0.52.2-7 (using .../whiptail_0.52.2-8_amd64.deb) ...
 Unpacking replacement whiptail ...
 Preparing to replace dselect 1.13.22 (using .../dselect_1.13.24_amd64.deb) ...
 Unpacking replacement dselect ...
-Preparing to replace cpp 4:4.1.1-11 (using .../cpp_4%3a4.1.1-13_amd64.deb) ...
-Unpacking replacement cpp ...
 Preparing to replace make 3.81-2 (using .../archives/make_3.81-3_amd64.deb) ...
 Unpacking replacement make ...
 Preparing to replace dpkg-dev 1.13.22 (using .../dpkg-dev_1.13.24_all.deb) ...
 Unpacking replacement dpkg-dev ...
-Preparing to replace gcc 4:4.1.1-11 (using .../gcc_4%3a4.1.1-13_amd64.deb) ...
-Removing old gcc doc directory.
-Unpacking replacement gcc ...
-Preparing to replace g++ 4:4.1.1-11 (using .../g++_4%3a4.1.1-13_amd64.deb) ...
-Unpacking replacement g++ ...
-Setting up linux-kernel-headers (2.6.18-5) ...
+Setting up linux-kernel-headers (2.6.18-6) ...
 Setting up libc6-dev (2.3.6.ds1-7) ...
-Setting up cpp-4.1 (4.1.1-17) ...
-Setting up libssp0 (4.1.1-17) ...
+Setting up cpp-4.1 (4.1.1-18) ...
+Setting up libssp0 (4.1.1-18) ...
 
-Setting up gcc-4.1 (4.1.1-17) ...
+Setting up gcc-4.1 (4.1.1-18) ...
 Setting up passwd (4.0.18.1-5) ...
 
-Setting up adduser (3.99) ...
-
-Setting up cron (3.0pl1-99) ...
-Installing new version of config file /etc/init.d/cron ...
-Installing new version of config file /etc/cron.daily/standard ...
-Installing new version of config file /etc/crontab ...
+Setting up aptitude (0.4.4-1) ...
 
 Setting up dhcp3-common (3.0.4-10) ...
-Setting up dhcp3-client (3.0.4-10) ...
-
 Setting up gettext-base (0.15-2) ...
 
-Setting up ifupdown (0.6.8) ...
-ifupdown.postinst: Warning: No 'iface lo' definition found in /etc/network/interfaces
-ifupdown.postinst: Warning: No 'auto lo' statement found in /etc/network/interfaces
-
 Setting up iputils-ping (20020927-3.1) ...
 Setting up libopencdk8 (0.5.9-2) ...
 
@@ -381,28 +335,18 @@ Setting up libtasn1-3 (0.3.6-2) ...
 
 Setting up libgnutls13 (1.4.4-2) ...
 
-Setting up libncursesw5 (5.5-5) ...
-
 Setting up libnewt0.52 (0.52.2-8) ...
 
-Setting up man-db (2.4.3-4) ...
+Setting up nano (1.9.99pre3-1) ...
 
-Setting up update-inetd (4.27) ...
-Setting up openbsd-inetd (0.20050402-3) ...
-Installing new version of config file /etc/init.d/openbsd-inetd ...
+Setting up vim-common (7.0-152+1) ...
 
-Setting up netbase (4.27) ...
-Installing new version of config file /etc/init.d/networking ...
-Installing new version of config file /etc/services ...
+Setting up vim-tiny (7.0-152+1) ...
 
 Setting up whiptail (0.52.2-8) ...
 Setting up dselect (1.13.24) ...
-Setting up cpp (4.1.1-13) ...
-
 Setting up make (3.81-3) ...
 Setting up dpkg-dev (1.13.24) ...
-Setting up gcc (4.1.1-13) ...
-
 Setting up klogd (1.4.1-20) ...
 Installing new version of config file /etc/init.d/klogd ...
 
@@ -411,11 +355,27 @@ Installing new version of config file /etc/init.d/sysklogd ...
 Installing new version of config file /etc/cron.daily/sysklogd ...
 
 Setting up tasksel-data (2.57) ...
-Setting up libstdc++6-4.1-dev (4.1.1-17) ...
-Setting up g++-4.1 (4.1.1-17) ...
-Setting up tasksel (2.57) ...
+Setting up debconf-i18n (1.5.7) ...
+Setting up libstdc++6-4.1-dev (4.1.1-18) ...
+Setting up g++-4.1 (4.1.1-18) ...
+Setting up debconf (1.5.7) ...
+
+Setting up adduser (3.99) ...
 
-Setting up g++ (4.1.1-13) ...
+Setting up cron (3.0pl1-99) ...
+Installing new version of config file /etc/init.d/cron ...
+Installing new version of config file /etc/cron.daily/standard ...
+Installing new version of config file /etc/crontab ...
+
+Setting up dhcp3-client (3.0.4-10) ...
+
+Setting up ifupdown (0.6.8) ...
+ifupdown.postinst: Warning: No 'iface lo' definition found in /etc/network/interfaces
+ifupdown.postinst: Warning: No 'auto lo' statement found in /etc/network/interfaces
+
+Setting up man-db (2.4.3-4) ...
+
+Setting up tasksel (2.57) ...
 
 Reading package lists...
 Building dependency tree...
@@ -429,9 +389,9 @@ umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//14095/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//32030/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//14095 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//32030 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-etch.log b/testsuite/cdebootstrap/pdebuild-internal-etch.log
index ee20dd7..b3f206a 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-etch.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-etch.log
@@ -1,11 +1,11 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2
  -> policy-rc.d already exists
 Using: : pdebuild-internal,v 1.13 2006/06/25 16:39:31 dancer Exp $
 Reading package lists...
@@ -25,9 +25,9 @@ Get:1 http://ftp.jp.debian.org etch/main libdebian-installer4 0.45 [27.3kB]
 Get:2 http://ftp.jp.debian.org etch/main libdebian-installer-extra4 0.45 [10.2kB]
 Get:3 http://ftp.jp.debian.org etch/main cdebootstrap 0.3.11 [26.5kB]
 Get:4 http://ftp.jp.debian.org etch/main pbuilder 0.159 [78.9kB]
-Fetched 143kB in 4s (32.9kB/s)
+Fetched 143kB in 0s (290kB/s)
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 12055 files and directories currently installed.)
+(Reading database ... 12057 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.45_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.45_amd64.deb) ...
@@ -71,9 +71,9 @@ Get:6 http://ftp.jp.debian.org etch/main po-debconf 1.0.6 [111kB]
 Get:7 http://ftp.jp.debian.org etch/main debhelper 5.0.40 [510kB]
 Get:8 http://ftp.jp.debian.org etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:9 http://ftp.jp.debian.org etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 2917kB in 1s (2067kB/s)
+Fetched 2917kB in 1s (2391kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 12152 files and directories currently installed.)
+(Reading database ... 12154 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-4_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-4_amd64.deb) ...
@@ -113,9 +113,9 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (613kB/s)
+Fetched 97.4kB in 0s (781kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12751 files and directories currently installed.)
+(Reading database ... 12753 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
 Setting up fakeroot (1.5.10) ...
 
@@ -129,14 +129,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -331,18 +331,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -355,26 +355,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -425,7 +425,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
-Wed Oct 25 03:54:57 UTC 2006
+Sun Oct 29 03:25:07 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -495,13 +495,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
-Wed Oct 25 03:55:02 UTC 2006
+Sun Oct 29 03:25:12 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-b: b
 c: c
+b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -510,9 +510,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -520,58 +520,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
 	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
 	    /usr/bin/install -c -m 644 ./$file \
-			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
-test -z "/usr/bin" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+test -z "/usr/bin" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -596,6 +596,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/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir3/8291 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir3/26214 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-sid.log b/testsuite/cdebootstrap/pdebuild-internal-sid.log
index 9b237ef..7138d7a 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-sid.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-sid.log
@@ -1,11 +1,11 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2
  -> policy-rc.d already exists
 Using: : pdebuild-internal,v 1.13 2006/06/25 16:39:31 dancer Exp $
 Reading package lists...
@@ -24,23 +24,23 @@ After unpacking 782kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main libdebian-installer4 0.45 [27.3kB]
 Get:2 http://ftp.jp.debian.org sid/main libdebian-installer-extra4 0.45 [10.2kB]
 Get:3 http://ftp.jp.debian.org sid/main cdebootstrap 0.3.15 [26.7kB]
-Get:4 http://ftp.jp.debian.org sid/main pbuilder 0.159 [78.9kB]
-Fetched 143kB in 3s (38.2kB/s)
+Get:4 http://ftp.jp.debian.org sid/main pbuilder 0.160 [78.9kB]
+Fetched 143kB in 0s (203kB/s)
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 12118 files and directories currently installed.)
+(Reading database ... 12117 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.45_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.45_amd64.deb) ...
 Selecting previously deselected package cdebootstrap.
 Unpacking cdebootstrap (from .../cdebootstrap_0.3.15_amd64.deb) ...
 Selecting previously deselected package pbuilder.
-Unpacking pbuilder (from .../pbuilder_0.159_all.deb) ...
+Unpacking pbuilder (from .../pbuilder_0.160_all.deb) ...
 Setting up libdebian-installer4 (0.45) ...
 
 Setting up libdebian-installer-extra4 (0.45) ...
 
 Setting up cdebootstrap (0.3.15) ...
-Setting up pbuilder (0.159) ...
+Setting up pbuilder (0.160) ...
 Setting DEBBUILDOPTS=
  -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.28 2006/05/30 23:45:45 dancer Exp $
  -> Considering  debhelper (>> 3.0.0)
@@ -71,9 +71,9 @@ Get:6 http://ftp.jp.debian.org sid/main po-debconf 1.0.7 [106kB]
 Get:7 http://ftp.jp.debian.org sid/main debhelper 5.0.40 [510kB]
 Get:8 http://ftp.jp.debian.org sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:9 http://ftp.jp.debian.org sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3097kB in 1s (2144kB/s)
+Fetched 3097kB in 1s (2586kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 12211 files and directories currently installed.)
+(Reading database ... 12210 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-4_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-4_amd64.deb) ...
@@ -113,9 +113,9 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (571kB/s)
+Fetched 97.4kB in 0s (1069kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12816 files and directories currently installed.)
+(Reading database ... 12815 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
 Setting up fakeroot (1.5.10) ...
 
@@ -129,14 +129,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -331,18 +331,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -355,26 +355,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -412,8 +412,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
@@ -421,11 +421,11 @@ dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
 success
 PASS: tests/param-r-invalid.sh
-2: 2
 1: 1
+2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Wed Oct 25 03:41:20 UTC 2006
+Sun Oct 29 03:19:09 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -495,11 +495,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
-Wed Oct 25 03:41:25 UTC 2006
+Sun Oct 29 03:19:14 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
+dsh: Process terminated (before write).
 b: b
 c: c
 PASS: tests/segv-catcher.sh
@@ -510,9 +511,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -520,58 +521,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
 	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
 	    /usr/bin/install -c -m 644 ./$file \
-			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
-test -z "/usr/bin" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+test -z "/usr/bin" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -595,6 +596,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/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir3/4855 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir3/22445 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-etch.log b/testsuite/cdebootstrap/pdebuild-normal-etch.log
index ca2597b..8335cc5 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-etch.log
+++ b/testsuite/cdebootstrap/pdebuild-normal-etch.log
@@ -7,14 +7,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -31,10 +31,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Wed Oct 25 12:53:21 JST 2006
-pbuilder-time-stamp: 1161748401
+Current time: Sun Oct 29 12:23:30 JST 2006
+pbuilder-time-stamp: 1162092210
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -70,9 +70,9 @@ Get:6 http://ftp.jp.debian.org etch/main po-debconf 1.0.6 [111kB]
 Get:7 http://ftp.jp.debian.org etch/main debhelper 5.0.40 [510kB]
 Get:8 http://ftp.jp.debian.org etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:9 http://ftp.jp.debian.org etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 2917kB in 1s (2244kB/s)
+Fetched 2917kB in 1s (2006kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 12055 files and directories currently installed.)
+(Reading database ... 12057 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-4_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-4_amd64.deb) ...
@@ -112,9 +112,9 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (650kB/s)
+Fetched 97.4kB in 0s (796kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12654 files and directories currently installed.)
+(Reading database ... 12656 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
 Setting up fakeroot (1.5.10) ...
 
@@ -450,7 +450,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Wed Oct 25 03:54:06 UTC 2006
+Sun Oct 29 03:24:14 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -520,7 +520,7 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Wed Oct 25 03:54:11 UTC 2006
+Sun Oct 29 03:24:19 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -633,7 +633,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Wed Oct 25 12:54:13 JST 2006
-pbuilder-time-stamp: 1161748453
+Current time: Sun Oct 29 12:24:21 JST 2006
+pbuilder-time-stamp: 1162092261
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir3/2404 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir3/20388 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-sid.log b/testsuite/cdebootstrap/pdebuild-normal-sid.log
index da69a0f..0aac662 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-sid.log
+++ b/testsuite/cdebootstrap/pdebuild-normal-sid.log
@@ -7,14 +7,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -31,10 +31,10 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Wed Oct 25 12:39:43 JST 2006
-pbuilder-time-stamp: 1161747583
+Current time: Sun Oct 29 12:17:28 JST 2006
+pbuilder-time-stamp: 1162091848
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -70,9 +70,9 @@ Get:6 http://ftp.jp.debian.org sid/main po-debconf 1.0.7 [106kB]
 Get:7 http://ftp.jp.debian.org sid/main debhelper 5.0.40 [510kB]
 Get:8 http://ftp.jp.debian.org sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:9 http://ftp.jp.debian.org sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3097kB in 1s (1989kB/s)
+Fetched 3097kB in 1s (1749kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 12118 files and directories currently installed.)
+(Reading database ... 12117 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-4_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-4_amd64.deb) ...
@@ -112,9 +112,9 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (564kB/s)
+Fetched 97.4kB in 0s (1082kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12723 files and directories currently installed.)
+(Reading database ... 12722 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
 Setting up fakeroot (1.5.10) ...
 
@@ -450,7 +450,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Wed Oct 25 03:40:30 UTC 2006
+Sun Oct 29 03:18:17 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -520,13 +520,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
-Wed Oct 25 03:40:35 UTC 2006
+Sun Oct 29 03:18:22 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 b: b
-a: a
 c: c
+dsh: Process terminated (before write).
+a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -632,7 +633,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Wed Oct 25 12:40:37 JST 2006
-pbuilder-time-stamp: 1161747637
+Current time: Sun Oct 29 12:18:24 JST 2006
+pbuilder-time-stamp: 1162091904
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.XruFV11012/dir3/31487 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir3/16688 and its subdirectories