testsuite update

35 files changed, 198 insertions, 213 deletions

diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
index 0279c8e..45f982c 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
@@ -409,7 +409,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 10:24:34 UTC 2007
+Sun May 27 13:05:15 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -422,18 +422,6 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 DUMPing parameters passed to llexec
 [2] 
-3: Using sleep as the remote shell
-3: Show machine names on output
-3: Adding machine 5,4,3,2,1 to list
-3: Setting forklimit to 3 and wait_shell to 0
-3: DUMPing parameters passed to llexec
-3: [3] 
-Using sleep as the remote shell
-Show machine names on output
-Adding machine 5,4,3,2,1 to list
-Setting forklimit to 3 and wait_shell to 0
-DUMPing parameters passed to llexec
-[3] 
 1: Using sleep as the remote shell
 1: Show machine names on output
 1: Adding machine 5,4,3,2,1 to list
@@ -448,6 +436,18 @@ Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 DUMPing parameters passed to llexec
 [1] 
+3: Using sleep as the remote shell
+3: Show machine names on output
+3: Adding machine 5,4,3,2,1 to list
+3: Setting forklimit to 3 and wait_shell to 0
+3: DUMPing parameters passed to llexec
+3: [3] 
+Using sleep as the remote shell
+Show machine names on output
+Adding machine 5,4,3,2,1 to list
+Setting forklimit to 3 and wait_shell to 0
+DUMPing parameters passed to llexec
+[3] 
 4: Using sleep as the remote shell
 4: Show machine names on output
 4: Adding machine 5,4,3,2,1 to list
@@ -479,14 +479,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 10:24:39 UTC 2007
+Sun May 27 13:05:20 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-a: a
 b: b
 c: c
 dsh: Process terminated (before write).
+a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-lenny.log b/testsuite/cdebootstrap/pbuilder-build-dsh-lenny.log
index ef77124..2f926f2 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-lenny.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-lenny.log
@@ -395,8 +395,8 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
-b: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -405,11 +405,11 @@ dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
 success
 PASS: tests/param-r-invalid.sh
-2: 2
 1: 1
+2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 10:35:36 UTC 2007
+Sun May 27 13:41:35 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -422,18 +422,6 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 DUMPing parameters passed to llexec
 [2] 
-3: Using sleep as the remote shell
-3: Show machine names on output
-3: Adding machine 5,4,3,2,1 to list
-3: Setting forklimit to 3 and wait_shell to 0
-3: DUMPing parameters passed to llexec
-3: [3] 
-Using sleep as the remote shell
-Show machine names on output
-Adding machine 5,4,3,2,1 to list
-Setting forklimit to 3 and wait_shell to 0
-DUMPing parameters passed to llexec
-[3] 
 1: Using sleep as the remote shell
 1: Show machine names on output
 1: Adding machine 5,4,3,2,1 to list
@@ -448,6 +436,18 @@ Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 DUMPing parameters passed to llexec
 [1] 
+3: Using sleep as the remote shell
+3: Show machine names on output
+3: Adding machine 5,4,3,2,1 to list
+3: Setting forklimit to 3 and wait_shell to 0
+3: DUMPing parameters passed to llexec
+3: [3] 
+Using sleep as the remote shell
+Show machine names on output
+Adding machine 5,4,3,2,1 to list
+Setting forklimit to 3 and wait_shell to 0
+DUMPing parameters passed to llexec
+[3] 
 4: Using sleep as the remote shell
 4: Show machine names on output
 4: Adding machine 5,4,3,2,1 to list
@@ -479,14 +479,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 10:35:41 UTC 2007
+Sun May 27 13:41:40 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-a: a
 b: b
 c: c
 dsh: Process terminated (before write).
+a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
index 574d8f4..3555319 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
@@ -394,10 +394,10 @@ success
 success
 success
 success
-a: dsh: Failed executing ./invalid-exec-file with llexec call
-b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+a: dsh: Failed executing ./invalid-exec-file with llexec call
+b: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -409,7 +409,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 10:16:29 UTC 2007
+Sun May 27 12:31:50 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -422,18 +422,6 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 DUMPing parameters passed to llexec
 [2] 
-3: Using sleep as the remote shell
-3: Show machine names on output
-3: Adding machine 5,4,3,2,1 to list
-3: Setting forklimit to 3 and wait_shell to 0
-3: DUMPing parameters passed to llexec
-3: [3] 
-Using sleep as the remote shell
-Show machine names on output
-Adding machine 5,4,3,2,1 to list
-Setting forklimit to 3 and wait_shell to 0
-DUMPing parameters passed to llexec
-[3] 
 1: Using sleep as the remote shell
 1: Show machine names on output
 1: Adding machine 5,4,3,2,1 to list
@@ -448,6 +436,18 @@ Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 DUMPing parameters passed to llexec
 [1] 
+3: Using sleep as the remote shell
+3: Show machine names on output
+3: Adding machine 5,4,3,2,1 to list
+3: Setting forklimit to 3 and wait_shell to 0
+3: DUMPing parameters passed to llexec
+3: [3] 
+Using sleep as the remote shell
+Show machine names on output
+Adding machine 5,4,3,2,1 to list
+Setting forklimit to 3 and wait_shell to 0
+DUMPing parameters passed to llexec
+[3] 
 4: Using sleep as the remote shell
 4: Show machine names on output
 4: Adding machine 5,4,3,2,1 to list
@@ -479,13 +479,13 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 10:16:34 UTC 2007
+Sun May 27 12:31:56 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-dsh: Process terminated (before write).
 b: b
+dsh: Process terminated (before write).
 c: c
 PASS: tests/segv-catcher.sh
 l w
diff --git a/testsuite/cdebootstrap/pbuilder-create-etch.log b/testsuite/cdebootstrap/pbuilder-create-etch.log
index c27eaad..a2a601c 100644
--- a/testsuite/cdebootstrap/pbuilder-create-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-create-etch.log
@@ -320,8 +320,7 @@ P: Extracting sysvinit
 P: Extracting tar
 P: Extracting util-linux
 O: Selecting previously deselected package base-passwd.
-O: (Reading database ... 
-O: 0 files and directories currently installed.)
+O: (Reading database ... 0 files and directories currently installed.)
 O: Unpacking base-passwd (from .../base-passwd_3.5.11_amd64.deb) ...
 P: Unpacking package base-passwd
 O: dpkg: base-passwd: dependency problems, but configuring anyway as you request:
@@ -364,8 +363,7 @@ O: Setting up dpkg (1.13.25) ...
 P: Configuring package dpkg
 O: 
 O: Selecting previously deselected package tzdata.
-O: (Reading database ... 
-O: 254 files and directories currently installed.)
+O: (Reading database ... 254 files and directories currently installed.)
 O: Unpacking tzdata (from .../tzdata_2007b-1_all.deb) ...
 P: Unpacking package tzdata
 O: Selecting previously deselected package libc6.
@@ -1058,8 +1056,7 @@ O:   vim-tiny wget whiptail
 O: debconf: delaying package configuration, since apt-utils is not installed
 O: Authentication warning overridden.
 O: Selecting previously deselected package adduser.
-O: (Reading database ... 
-O: 5216 files and directories currently installed.)
+O: (Reading database ... 5216 files and directories currently installed.)
 O: Unpacking adduser (from .../adduser_3.102_all.deb) ...
 P: Unpacking package adduser
 O: Selecting previously deselected package libdb4.4.
@@ -1484,6 +1481,5 @@ kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> creating base tarball [/TESTDIR/testimage]
- -> Aborting with an error
  -> cleaning the build env 
     -> removing directory /var/cache/pbuilder/build//NUM and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-lenny.log b/testsuite/cdebootstrap/pbuilder-create-lenny.log
index 1902a19..9f03f27 100644
--- a/testsuite/cdebootstrap/pbuilder-create-lenny.log
+++ b/testsuite/cdebootstrap/pbuilder-create-lenny.log
@@ -332,7 +332,8 @@ P: Configuring package base-passwd
 O: 
 P: Configuring helper cdebootstrap-helper-diverts
 O: Selecting previously deselected package cdebootstrap-helper-diverts.
-O: (Reading database ... 24 files and directories currently installed.)
+O: (Reading database ... 
+O: 24 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-diverts (from .../cdebootstrap-helper-diverts.deb) ...
 O: Adding `diversion of /sbin/start-stop-daemon to /sbin/start-stop-daemon.REAL by cdebootstrap-helper-diverts'
 O: Adding `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by cdebootstrap-helper-diverts'
@@ -745,8 +746,8 @@ O: Setting up tzdata (2007f-3) ...
 P: Configuring package tzdata
 O: 
 O: Current default timezone: 'Etc/UTC'
-O: Local time is now:      Sun May 27 10:33:35 UTC 2007.
-O: Universal Time is now:  Sun May 27 10:33:35 UTC 2007.
+O: Local time is now:      Sun May 27 13:31:31 UTC 2007.
+O: Universal Time is now:  Sun May 27 13:31:31 UTC 2007.
 O: Run 'dpkg-reconfigure tzdata' if you wish to change it.
 O: 
 O: 
@@ -990,6 +991,8 @@ P: Configuring package gnupg
 O: Setting up debian-archive-keyring (2007.02.19) ...
 P: Configuring package debian-archive-keyring
 O: gpg: 
+O: keyring `/etc/apt/secring.gpg' created
+O: gpg: 
 O: keyring `/etc/apt/trusted.gpg' created
 O: gpg: 
 O: /etc/apt/trustdb.gpg: trustdb created
@@ -1031,7 +1034,6 @@ O: Get:2 bootstrap: . Release [68.5kB]
 O: Reading package lists...
 O: 
 O: Reading package lists...
-O: 
 O: Building dependency tree...
 O: 
 O: Suggested packages:
@@ -1486,6 +1488,5 @@ kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> creating base tarball [/TESTDIR/testimage]
- -> Aborting with an error
  -> cleaning the build env 
     -> removing directory /var/cache/pbuilder/build//NUM and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-sid.log b/testsuite/cdebootstrap/pbuilder-create-sid.log
index dc3951a..bfd1fa5 100644
--- a/testsuite/cdebootstrap/pbuilder-create-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-create-sid.log
@@ -326,11 +326,11 @@ O: Selecting previously deselected package base-passwd.
 O: (Reading database ... 0 files and directories currently installed.)
 O: Unpacking base-passwd (from .../base-passwd_3.5.11_amd64.deb) ...
 P: Unpacking package base-passwd
-O: Setting up base-passwd (3.5.11) ...
-P: Configuring package base-passwd
 O: dpkg: base-passwd: dependency problems, but configuring anyway as you request:
 O:  base-passwd depends on libc6 (>= 2.3.5-1); however:
 O:   Package libc6 is not installed.
+O: Setting up base-passwd (3.5.11) ...
+P: Configuring package base-passwd
 O: 
 P: Configuring helper cdebootstrap-helper-diverts
 O: Selecting previously deselected package cdebootstrap-helper-diverts.
@@ -341,8 +341,7 @@ O: Adding `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by c
 O: Setting up cdebootstrap-helper-diverts (1) ...
 P: Configuring helper cdebootstrap-helper-makedev
 O: Selecting previously deselected package cdebootstrap-helper-makedev.
-O: (Reading database ... 
-O: 29 files and directories currently installed.)
+O: (Reading database ... 29 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-makedev (from .../cdebootstrap-helper-makedev.deb) ...
 O: Setting up cdebootstrap-helper-makedev (1) ...
 O: 
@@ -895,8 +894,8 @@ O: Setting up tzdata (2007f-4) ...
 P: Configuring package tzdata
 O: 
 O: Current default timezone: 'Etc/UTC'
-O: Local time is now:      Sun May 27 10:14:11 UTC 2007.
-O: Universal Time is now:  Sun May 27 10:14:11 UTC 2007.
+O: Local time is now:      Sun May 27 12:23:27 UTC 2007.
+O: Universal Time is now:  Sun May 27 12:23:27 UTC 2007.
 O: Run 'dpkg-reconfigure tzdata' if you wish to change it.
 O: 
 O: 
@@ -904,8 +903,7 @@ O: Setting up util-linux (2.12r-19) ...
 P: Configuring package util-linux
 O: 
 O: Selecting previously deselected package libbz2-1.0.
-O: (Reading database ... 
-O: 4876 files and directories currently installed.)
+O: (Reading database ... 4876 files and directories currently installed.)
 O: Unpacking libbz2-1.0 (from .../libbz2-1.0_1.0.3-7_amd64.deb) ...
 P: Unpacking package libbz2-1.0
 O: Selecting previously deselected package libgpg-error0.
@@ -1492,6 +1490,5 @@ kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> creating base tarball [/TESTDIR/testimage]
- -> Aborting with an error
  -> cleaning the build env 
     -> removing directory /var/cache/pbuilder/build//NUM and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-etch.log b/testsuite/cdebootstrap/pbuilder-update-etch-etch.log
index 0c908a1..b21a98b 100644
--- a/testsuite/cdebootstrap/pbuilder-update-etch-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-update-etch-etch.log
@@ -118,8 +118,8 @@ Setting up debconf (1.5.13) ...
 Setting up tzdata (2007f-3) ...
 
 Current default timezone: 'Etc/UTC'
-Local time is now:      Sun May 27 10:28:44 UTC 2007.
-Universal Time is now:  Sun May 27 10:28:44 UTC 2007.
+Local time is now:      Sun May 27 13:14:40 UTC 2007.
+Universal Time is now:  Sun May 27 13:14:40 UTC 2007.
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
 
@@ -226,6 +226,5 @@ kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> creating base tarball [/TESTDIR/testimage]
- -> Aborting with an error
  -> cleaning the build env 
     -> removing directory /var/cache/pbuilder/build//NUM and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-lenny-sid-experimental.log b/testsuite/cdebootstrap/pbuilder-update-etch-lenny-sid-experimental.log
index 0c85bb3..06e1e85 100644
--- a/testsuite/cdebootstrap/pbuilder-update-etch-lenny-sid-experimental.log
+++ b/testsuite/cdebootstrap/pbuilder-update-etch-lenny-sid-experimental.log
@@ -147,6 +147,5 @@ kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> creating base tarball [/TESTDIR/testimage]
- -> Aborting with an error
  -> cleaning the build env 
     -> removing directory /var/cache/pbuilder/build//NUM and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
index 1737fee..84dc86a 100644
--- a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
@@ -241,8 +241,8 @@ Unpacking replacement tzdata ...
 Setting up tzdata (2007f-4) ...
 
 Current default timezone: 'Etc/UTC'
-Local time is now:      Sun May 27 10:30:23 UTC 2007.
-Universal Time is now:  Sun May 27 10:30:23 UTC 2007.
+Local time is now:      Sun May 27 13:18:03 UTC 2007.
+Universal Time is now:  Sun May 27 13:18:03 UTC 2007.
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
 
@@ -374,6 +374,5 @@ kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> creating base tarball [/TESTDIR/testimage]
- -> Aborting with an error
  -> cleaning the build env 
     -> removing directory /var/cache/pbuilder/build//NUM and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-lenny-sid-experimental.log b/testsuite/cdebootstrap/pbuilder-update-lenny-sid-experimental.log
index 0c85bb3..06e1e85 100644
--- a/testsuite/cdebootstrap/pbuilder-update-lenny-sid-experimental.log
+++ b/testsuite/cdebootstrap/pbuilder-update-lenny-sid-experimental.log
@@ -147,6 +147,5 @@ kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> creating base tarball [/TESTDIR/testimage]
- -> Aborting with an error
  -> cleaning the build env 
     -> removing directory /var/cache/pbuilder/build//NUM and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-lenny-sid.log b/testsuite/cdebootstrap/pbuilder-update-lenny-sid.log
index 6a983cd..79b3bc3 100644
--- a/testsuite/cdebootstrap/pbuilder-update-lenny-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-update-lenny-sid.log
@@ -241,8 +241,8 @@ Unpacking replacement tzdata ...
 Setting up tzdata (2007f-4) ...
 
 Current default timezone: 'Etc/UTC'
-Local time is now:      Sun May 27 10:39:22 UTC 2007.
-Universal Time is now:  Sun May 27 10:39:22 UTC 2007.
+Local time is now:      Sun May 27 13:54:26 UTC 2007.
+Universal Time is now:  Sun May 27 13:54:26 UTC 2007.
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
 
@@ -374,6 +374,5 @@ kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> creating base tarball [/TESTDIR/testimage]
- -> Aborting with an error
  -> cleaning the build env 
     -> removing directory /var/cache/pbuilder/build//NUM and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-etch.log b/testsuite/cdebootstrap/pdebuild-internal-etch.log
index b81e4a3..0f3a2e1 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-etch.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-etch.log
@@ -416,10 +416,10 @@ success
 success
 success
 success
+d: dsh: Failed executing ./invalid-exec-file with llexec call
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -427,11 +427,11 @@ dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
 success
 PASS: tests/param-r-invalid.sh
-2: 2
 1: 1
+2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 10:27:06 UTC 2007
+Sun May 27 13:12:34 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -501,7 +501,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
-Sun May 27 10:27:11 UTC 2007
+Sun May 27 13:12:39 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
diff --git a/testsuite/cdebootstrap/pdebuild-internal-lenny.log b/testsuite/cdebootstrap/pdebuild-internal-lenny.log
index 232d48e..7795ca3 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-lenny.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-lenny.log
@@ -392,6 +392,7 @@ test to check that unknown parameter checking is right.
 PASS: tests/param-unknown.sh
 test1
 test2
+dsh: Process terminated (before write).
 PASS: tests/param-i.sh
 Check that cn4 option is working.
 PASS: tests/param-cn4.sh
@@ -415,9 +416,9 @@ success
 success
 success
 success
+d: dsh: Failed executing ./invalid-exec-file with llexec call
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
-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
@@ -430,7 +431,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 10:37:51 UTC 2007
+Sun May 27 13:50:59 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -500,14 +501,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 10:37:56 UTC 2007
+Sun May 27 13:51:04 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-a: a
 b: b
-dsh: Process terminated (before write).
 c: c
+dsh: Process terminated (before write).
+a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
diff --git a/testsuite/cdebootstrap/pdebuild-internal-sid.log b/testsuite/cdebootstrap/pdebuild-internal-sid.log
index a3b86b7..969c65c 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-sid.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-sid.log
@@ -19,12 +19,12 @@ Recommended packages:
 The following NEW packages will be installed:
   cdebootstrap libdebian-installer-extra4 libdebian-installer4 pbuilder
 0 upgraded, 4 newly installed, 0 to remove and 0 not upgraded.
-Need to get 153kB of archives.
-After unpacking 836kB of additional disk space will be used.
+Need to get 155kB of archives.
+After unpacking 844kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main libdebian-installer4 0.51 [28.1kB]
 Get:2 http://cdn.debian.or.jp sid/main libdebian-installer-extra4 0.51 [10.6kB]
 Get:3 http://cdn.debian.or.jp sid/main cdebootstrap 0.4.3 [29.0kB]
-Get:4 http://cdn.debian.or.jp sid/main pbuilder 0.166 [85.8kB]
+Get:4 http://cdn.debian.or.jp sid/main pbuilder 0.167 [87.1kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libdebian-installer4.
 (Reading database ... 11070 files and directories currently installed.)
@@ -34,13 +34,13 @@ Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.51_a
 Selecting previously deselected package cdebootstrap.
 Unpacking cdebootstrap (from .../cdebootstrap_0.4.3_amd64.deb) ...
 Selecting previously deselected package pbuilder.
-Unpacking pbuilder (from .../pbuilder_0.166_all.deb) ...
+Unpacking pbuilder (from .../pbuilder_0.167_all.deb) ...
 Setting up libdebian-installer4 (0.51) ...
 
 Setting up libdebian-installer-extra4 (0.51) ...
 
 Setting up cdebootstrap (0.4.3) ...
-Setting up pbuilder (0.166) ...
+Setting up pbuilder (0.167) ...
 Setting DEBBUILDOPTS=
  -> Attempting to parse the build-deps 
  -> Considering build-dep debhelper (>> 3.0.0)
@@ -75,7 +75,7 @@ Get:9 http://cdn.debian.or.jp sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11169 files and directories currently installed.)
+(Reading database ... 11170 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.20-8_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.20-8_amd64.deb) ...
@@ -121,7 +121,7 @@ After unpacking 451kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main fakeroot 1.7.1 [111kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11844 files and directories currently installed.)
+(Reading database ... 11845 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.7.1_amd64.deb) ...
 Setting up fakeroot (1.7.1) ...
 
@@ -430,7 +430,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 10:20:10 UTC 2007
+Sun May 27 12:43:10 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -500,14 +500,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 10:20:15 UTC 2007
+Sun May 27 12:43:17 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-dsh: Process terminated (before write).
 b: b
 c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
diff --git a/testsuite/cdebootstrap/pdebuild-normal-etch.log b/testsuite/cdebootstrap/pdebuild-normal-etch.log
index 9cb14d6..eb25563 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-etch.log
+++ b/testsuite/cdebootstrap/pdebuild-normal-etch.log
@@ -437,7 +437,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 10:25:42 UTC 2007
+Sun May 27 13:09:10 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -507,7 +507,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
-Sun May 27 10:25:47 UTC 2007
+Sun May 27 13:09:15 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
diff --git a/testsuite/cdebootstrap/pdebuild-normal-lenny.log b/testsuite/cdebootstrap/pdebuild-normal-lenny.log
index cf7fbd2..9f980dc 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-lenny.log
+++ b/testsuite/cdebootstrap/pdebuild-normal-lenny.log
@@ -437,7 +437,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 10:36:53 UTC 2007
+Sun May 27 13:46:56 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -450,18 +450,6 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 DUMPing parameters passed to llexec
 [2] 
-3: Using sleep as the remote shell
-3: Show machine names on output
-3: Adding machine 5,4,3,2,1 to list
-3: Setting forklimit to 3 and wait_shell to 0
-3: DUMPing parameters passed to llexec
-3: [3] 
-Using sleep as the remote shell
-Show machine names on output
-Adding machine 5,4,3,2,1 to list
-Setting forklimit to 3 and wait_shell to 0
-DUMPing parameters passed to llexec
-[3] 
 1: Using sleep as the remote shell
 1: Show machine names on output
 1: Adding machine 5,4,3,2,1 to list
@@ -476,6 +464,18 @@ Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 DUMPing parameters passed to llexec
 [1] 
+3: Using sleep as the remote shell
+3: Show machine names on output
+3: Adding machine 5,4,3,2,1 to list
+3: Setting forklimit to 3 and wait_shell to 0
+3: DUMPing parameters passed to llexec
+3: [3] 
+Using sleep as the remote shell
+Show machine names on output
+Adding machine 5,4,3,2,1 to list
+Setting forklimit to 3 and wait_shell to 0
+DUMPing parameters passed to llexec
+[3] 
 4: Using sleep as the remote shell
 4: Show machine names on output
 4: Adding machine 5,4,3,2,1 to list
@@ -507,7 +507,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
-Sun May 27 10:36:58 UTC 2007
+Sun May 27 13:47:01 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
diff --git a/testsuite/cdebootstrap/pdebuild-normal-sid.log b/testsuite/cdebootstrap/pdebuild-normal-sid.log
index 0c02df8..7340db3 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-sid.log
+++ b/testsuite/cdebootstrap/pdebuild-normal-sid.log
@@ -437,7 +437,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 10:18:45 UTC 2007
+Sun May 27 12:37:05 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -507,14 +507,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 10:18:50 UTC 2007
+Sun May 27 12:37:11 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
 b: b
-c: c
 dsh: Process terminated (before write).
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
diff --git a/testsuite/normal/pbuilder-build-dsh-etch.log b/testsuite/normal/pbuilder-build-dsh-etch.log
index 0f46a57..e141648 100644
--- a/testsuite/normal/pbuilder-build-dsh-etch.log
+++ b/testsuite/normal/pbuilder-build-dsh-etch.log
@@ -353,6 +353,7 @@ make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/po'
 make[2]: Nothing to be done for `check'.
 make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/po'
 make[2]: Entering directory `/tmp/buildd/dsh-0.25.8'
+sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 /usr/bin/make  dsh
 make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
 make[3]: `dsh' is up to date.
@@ -409,7 +410,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 09:58:13 UTC 2007
+Sun May 27 11:32:53 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -479,7 +480,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
-Sun May 27 09:58:18 UTC 2007
+Sun May 27 11:32:58 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
diff --git a/testsuite/normal/pbuilder-build-dsh-lenny.log b/testsuite/normal/pbuilder-build-dsh-lenny.log
index b22cb29..46ab0db 100644
--- a/testsuite/normal/pbuilder-build-dsh-lenny.log
+++ b/testsuite/normal/pbuilder-build-dsh-lenny.log
@@ -394,9 +394,9 @@ success
 success
 success
 success
-a: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -409,7 +409,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 10:06:51 UTC 2007
+Sun May 27 11:51:51 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -422,18 +422,6 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 DUMPing parameters passed to llexec
 [2] 
-3: Using sleep as the remote shell
-3: Show machine names on output
-3: Adding machine 5,4,3,2,1 to list
-3: Setting forklimit to 3 and wait_shell to 0
-3: DUMPing parameters passed to llexec
-3: [3] 
-Using sleep as the remote shell
-Show machine names on output
-Adding machine 5,4,3,2,1 to list
-Setting forklimit to 3 and wait_shell to 0
-DUMPing parameters passed to llexec
-[3] 
 1: Using sleep as the remote shell
 1: Show machine names on output
 1: Adding machine 5,4,3,2,1 to list
@@ -448,6 +436,18 @@ Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 DUMPing parameters passed to llexec
 [1] 
+3: Using sleep as the remote shell
+3: Show machine names on output
+3: Adding machine 5,4,3,2,1 to list
+3: Setting forklimit to 3 and wait_shell to 0
+3: DUMPing parameters passed to llexec
+3: [3] 
+Using sleep as the remote shell
+Show machine names on output
+Adding machine 5,4,3,2,1 to list
+Setting forklimit to 3 and wait_shell to 0
+DUMPing parameters passed to llexec
+[3] 
 4: Using sleep as the remote shell
 4: Show machine names on output
 4: Adding machine 5,4,3,2,1 to list
@@ -479,14 +479,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 10:06:56 UTC 2007
+Sun May 27 11:51:56 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
 b: b
-c: c
 dsh: Process terminated (before write).
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
diff --git a/testsuite/normal/pbuilder-build-dsh-sid.log b/testsuite/normal/pbuilder-build-dsh-sid.log
index 965e2cc..cb008d4 100644
--- a/testsuite/normal/pbuilder-build-dsh-sid.log
+++ b/testsuite/normal/pbuilder-build-dsh-sid.log
@@ -355,7 +355,6 @@ make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/po'
 make[2]: Entering directory `/tmp/buildd/dsh-0.25.8'
 /usr/bin/make  dsh
 make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
-make[3]: `dsh' is up to date.
 make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
 /usr/bin/make  check-TESTS
 make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
@@ -395,9 +394,9 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
-b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+b: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -409,7 +408,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 09:51:12 UTC 2007
+Sun May 27 11:21:46 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -479,14 +478,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 09:51:17 UTC 2007
+Sun May 27 11:21:52 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-dsh: Process terminated (before write).
 b: b
 c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
diff --git a/testsuite/normal/pbuilder-create-etch.log b/testsuite/normal/pbuilder-create-etch.log
index 6448c66..01b5827 100644
--- a/testsuite/normal/pbuilder-create-etch.log
+++ b/testsuite/normal/pbuilder-create-etch.log
@@ -593,7 +593,7 @@ Get:1 http://cdn.debian.or.jp etch Release.gpg [378B]
 Hit http://cdn.debian.or.jp etch Release
 Ign http://cdn.debian.or.jp etch/main Packages/DiffIndex
 Hit http://cdn.debian.or.jp etch/main Packages
-Fetched 378B in 0s (1376B/s)
+Fetched 378B in 0s (1299B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -707,6 +707,5 @@ kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> creating base tarball [/TESTDIR/testimage]
- -> Aborting with an error
  -> cleaning the build env 
     -> removing directory /var/cache/pbuilder/build//NUM and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-lenny.log b/testsuite/normal/pbuilder-create-lenny.log
index 6368c17..23e6c8d 100644
--- a/testsuite/normal/pbuilder-create-lenny.log
+++ b/testsuite/normal/pbuilder-create-lenny.log
@@ -592,7 +592,7 @@ Refreshing the base.tgz
 Get:1 http://cdn.debian.or.jp lenny Release.gpg [189B]
 Hit http://cdn.debian.or.jp lenny Release
 Get:2 http://cdn.debian.or.jp lenny/main Packages/DiffIndex [2038B]
-Fetched 2227B in 0s (5756B/s)
+Fetched 2227B in 0s (2751B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -705,6 +705,5 @@ kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> creating base tarball [/TESTDIR/testimage]
- -> Aborting with an error
  -> cleaning the build env 
     -> removing directory /var/cache/pbuilder/build//NUM and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-sid.log b/testsuite/normal/pbuilder-create-sid.log
index ee4f67b..d2a1e42 100644
--- a/testsuite/normal/pbuilder-create-sid.log
+++ b/testsuite/normal/pbuilder-create-sid.log
@@ -598,7 +598,7 @@ Refreshing the base.tgz
 Get:1 http://cdn.debian.or.jp sid Release.gpg [189B]
 Hit http://cdn.debian.or.jp sid Release
 Get:2 http://cdn.debian.or.jp sid/main Packages/DiffIndex [2038B]
-Fetched 2227B in 0s (6887B/s)
+Fetched 2227B in 0s (2919B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -705,6 +705,5 @@ kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> creating base tarball [/TESTDIR/testimage]
- -> Aborting with an error
  -> cleaning the build env 
     -> removing directory /var/cache/pbuilder/build//NUM and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-etch-etch.log b/testsuite/normal/pbuilder-update-etch-etch.log
index eac74de..abc58b0 100644
--- a/testsuite/normal/pbuilder-update-etch-etch.log
+++ b/testsuite/normal/pbuilder-update-etch-etch.log
@@ -118,8 +118,8 @@ Setting up debconf (1.5.13) ...
 Setting up tzdata (2007f-3) ...
 
 User defined timezone, leaving /etc/localtime unchanged.
-Local time is now:      Sun May 27 10:01:12 UTC 2007.
-Universal Time is now:  Sun May 27 10:01:12 UTC 2007.
+Local time is now:      Sun May 27 11:36:15 UTC 2007.
+Universal Time is now:  Sun May 27 11:36:15 UTC 2007.
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
 
@@ -226,6 +226,5 @@ kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> creating base tarball [/TESTDIR/testimage]
- -> Aborting with an error
  -> cleaning the build env 
     -> removing directory /var/cache/pbuilder/build//NUM and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-etch-lenny-sid-experimental.log b/testsuite/normal/pbuilder-update-etch-lenny-sid-experimental.log
index 0c85bb3..06e1e85 100644
--- a/testsuite/normal/pbuilder-update-etch-lenny-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-etch-lenny-sid-experimental.log
@@ -147,6 +147,5 @@ kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> creating base tarball [/TESTDIR/testimage]
- -> Aborting with an error
  -> cleaning the build env 
     -> removing directory /var/cache/pbuilder/build//NUM and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-etch-sid.log b/testsuite/normal/pbuilder-update-etch-sid.log
index 13e8e62..607bb02 100644
--- a/testsuite/normal/pbuilder-update-etch-sid.log
+++ b/testsuite/normal/pbuilder-update-etch-sid.log
@@ -241,8 +241,8 @@ Unpacking replacement tzdata ...
 Setting up tzdata (2007f-4) ...
 
 User defined timezone, leaving /etc/localtime unchanged.
-Local time is now:      Sun May 27 10:02:24 UTC 2007.
-Universal Time is now:  Sun May 27 10:02:24 UTC 2007.
+Local time is now:      Sun May 27 11:39:27 UTC 2007.
+Universal Time is now:  Sun May 27 11:39:27 UTC 2007.
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
 
@@ -374,6 +374,5 @@ kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> creating base tarball [/TESTDIR/testimage]
- -> Aborting with an error
  -> cleaning the build env 
     -> removing directory /var/cache/pbuilder/build//NUM and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-lenny-sid-experimental.log b/testsuite/normal/pbuilder-update-lenny-sid-experimental.log
index 0c85bb3..06e1e85 100644
--- a/testsuite/normal/pbuilder-update-lenny-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-lenny-sid-experimental.log
@@ -147,6 +147,5 @@ kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> creating base tarball [/TESTDIR/testimage]
- -> Aborting with an error
  -> cleaning the build env 
     -> removing directory /var/cache/pbuilder/build//NUM and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-lenny-sid.log b/testsuite/normal/pbuilder-update-lenny-sid.log
index 6ef549b..f1f60ef 100644
--- a/testsuite/normal/pbuilder-update-lenny-sid.log
+++ b/testsuite/normal/pbuilder-update-lenny-sid.log
@@ -241,8 +241,8 @@ Unpacking replacement tzdata ...
 Setting up tzdata (2007f-4) ...
 
 Current default timezone: 'Etc/UTC'
-Local time is now:      Sun May 27 10:10:05 UTC 2007.
-Universal Time is now:  Sun May 27 10:10:05 UTC 2007.
+Local time is now:      Sun May 27 12:06:02 UTC 2007.
+Universal Time is now:  Sun May 27 12:06:02 UTC 2007.
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
 
@@ -374,6 +374,5 @@ kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> creating base tarball [/TESTDIR/testimage]
- -> Aborting with an error
  -> cleaning the build env 
     -> removing directory /var/cache/pbuilder/build//NUM and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-etch.log b/testsuite/normal/pdebuild-internal-etch.log
index d42c722..69a81b0 100644
--- a/testsuite/normal/pdebuild-internal-etch.log
+++ b/testsuite/normal/pdebuild-internal-etch.log
@@ -431,7 +431,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 10:00:13 UTC 2007
+Sun May 27 11:34:42 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -501,7 +501,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
-Sun May 27 10:00:18 UTC 2007
+Sun May 27 11:34:47 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
diff --git a/testsuite/normal/pdebuild-internal-lenny.log b/testsuite/normal/pdebuild-internal-lenny.log
index fe2a992..c2f2643 100644
--- a/testsuite/normal/pdebuild-internal-lenny.log
+++ b/testsuite/normal/pdebuild-internal-lenny.log
@@ -392,6 +392,7 @@ test to check that unknown parameter checking is right.
 PASS: tests/param-unknown.sh
 test1
 test2
+dsh: Process terminated (before write).
 PASS: tests/param-i.sh
 Check that cn4 option is working.
 PASS: tests/param-cn4.sh
@@ -416,9 +417,9 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
+d: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -430,7 +431,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 10:08:47 UTC 2007
+Sun May 27 12:03:14 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -443,18 +444,6 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 DUMPing parameters passed to llexec
 [2] 
-3: Using sleep as the remote shell
-3: Show machine names on output
-3: Adding machine 5,4,3,2,1 to list
-3: Setting forklimit to 3 and wait_shell to 0
-3: DUMPing parameters passed to llexec
-3: [3] 
-Using sleep as the remote shell
-Show machine names on output
-Adding machine 5,4,3,2,1 to list
-Setting forklimit to 3 and wait_shell to 0
-DUMPing parameters passed to llexec
-[3] 
 1: Using sleep as the remote shell
 1: Show machine names on output
 1: Adding machine 5,4,3,2,1 to list
@@ -469,6 +458,18 @@ Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 DUMPing parameters passed to llexec
 [1] 
+3: Using sleep as the remote shell
+3: Show machine names on output
+3: Adding machine 5,4,3,2,1 to list
+3: Setting forklimit to 3 and wait_shell to 0
+3: DUMPing parameters passed to llexec
+3: [3] 
+Using sleep as the remote shell
+Show machine names on output
+Adding machine 5,4,3,2,1 to list
+Setting forklimit to 3 and wait_shell to 0
+DUMPing parameters passed to llexec
+[3] 
 4: Using sleep as the remote shell
 4: Show machine names on output
 4: Adding machine 5,4,3,2,1 to list
@@ -500,14 +501,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 10:08:52 UTC 2007
+Sun May 27 12:03:19 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-a: a
-dsh: Process terminated (before write).
 b: b
 c: c
+dsh: Process terminated (before write).
+a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
diff --git a/testsuite/normal/pdebuild-internal-sid.log b/testsuite/normal/pdebuild-internal-sid.log
index ca7c7c1..4535909 100644
--- a/testsuite/normal/pdebuild-internal-sid.log
+++ b/testsuite/normal/pdebuild-internal-sid.log
@@ -19,12 +19,12 @@ Recommended packages:
 The following NEW packages will be installed:
   cdebootstrap libdebian-installer-extra4 libdebian-installer4 pbuilder
 0 upgraded, 4 newly installed, 0 to remove and 0 not upgraded.
-Need to get 153kB of archives.
-After unpacking 836kB of additional disk space will be used.
+Need to get 155kB of archives.
+After unpacking 844kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main libdebian-installer4 0.51 [28.1kB]
 Get:2 http://cdn.debian.or.jp sid/main libdebian-installer-extra4 0.51 [10.6kB]
 Get:3 http://cdn.debian.or.jp sid/main cdebootstrap 0.4.3 [29.0kB]
-Get:4 http://cdn.debian.or.jp sid/main pbuilder 0.166 [85.8kB]
+Get:4 http://cdn.debian.or.jp sid/main pbuilder 0.167 [87.1kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libdebian-installer4.
 (Reading database ... 11070 files and directories currently installed.)
@@ -34,13 +34,13 @@ Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.51_a
 Selecting previously deselected package cdebootstrap.
 Unpacking cdebootstrap (from .../cdebootstrap_0.4.3_amd64.deb) ...
 Selecting previously deselected package pbuilder.
-Unpacking pbuilder (from .../pbuilder_0.166_all.deb) ...
+Unpacking pbuilder (from .../pbuilder_0.167_all.deb) ...
 Setting up libdebian-installer4 (0.51) ...
 
 Setting up libdebian-installer-extra4 (0.51) ...
 
 Setting up cdebootstrap (0.4.3) ...
-Setting up pbuilder (0.166) ...
+Setting up pbuilder (0.167) ...
 Setting DEBBUILDOPTS=
  -> Attempting to parse the build-deps 
  -> Considering build-dep debhelper (>> 3.0.0)
@@ -75,7 +75,7 @@ Get:9 http://cdn.debian.or.jp sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11169 files and directories currently installed.)
+(Reading database ... 11170 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.20-8_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.20-8_amd64.deb) ...
@@ -121,7 +121,7 @@ After unpacking 451kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main fakeroot 1.7.1 [111kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11844 files and directories currently installed.)
+(Reading database ... 11845 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.7.1_amd64.deb) ...
 Setting up fakeroot (1.7.1) ...
 
@@ -392,6 +392,7 @@ test to check that unknown parameter checking is right.
 PASS: tests/param-unknown.sh
 test1
 test2
+dsh: Process terminated (before write).
 PASS: tests/param-i.sh
 Check that cn4 option is working.
 PASS: tests/param-cn4.sh
@@ -430,7 +431,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 09:53:48 UTC 2007
+Sun May 27 11:26:21 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -500,7 +501,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
-Sun May 27 09:53:53 UTC 2007
+Sun May 27 11:26:26 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
diff --git a/testsuite/normal/pdebuild-normal-etch.log b/testsuite/normal/pdebuild-normal-etch.log
index fafba86..9ebc08a 100644
--- a/testsuite/normal/pdebuild-normal-etch.log
+++ b/testsuite/normal/pdebuild-normal-etch.log
@@ -433,11 +433,11 @@ dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
 success
 PASS: tests/param-r-invalid.sh
-1: 1
 2: 2
+1: 1
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 09:59:10 UTC 2007
+Sun May 27 11:33:53 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -507,14 +507,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 09:59:15 UTC 2007
+Sun May 27 11:33:58 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
 b: b
-c: c
 dsh: Process terminated (before write).
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
diff --git a/testsuite/normal/pdebuild-normal-lenny.log b/testsuite/normal/pdebuild-normal-lenny.log
index a021b80..0e2f0d0 100644
--- a/testsuite/normal/pdebuild-normal-lenny.log
+++ b/testsuite/normal/pdebuild-normal-lenny.log
@@ -398,6 +398,7 @@ test to check that unknown parameter checking is right.
 PASS: tests/param-unknown.sh
 test1
 test2
+dsh: Process terminated (before write).
 PASS: tests/param-i.sh
 Check that cn4 option is working.
 PASS: tests/param-cn4.sh
@@ -421,10 +422,10 @@ success
 success
 success
 success
+d: dsh: Failed executing ./invalid-exec-file with llexec call
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -436,7 +437,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 10:07:51 UTC 2007
+Sun May 27 11:56:54 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -449,18 +450,6 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 DUMPing parameters passed to llexec
 [2] 
-3: Using sleep as the remote shell
-3: Show machine names on output
-3: Adding machine 5,4,3,2,1 to list
-3: Setting forklimit to 3 and wait_shell to 0
-3: DUMPing parameters passed to llexec
-3: [3] 
-Using sleep as the remote shell
-Show machine names on output
-Adding machine 5,4,3,2,1 to list
-Setting forklimit to 3 and wait_shell to 0
-DUMPing parameters passed to llexec
-[3] 
 1: Using sleep as the remote shell
 1: Show machine names on output
 1: Adding machine 5,4,3,2,1 to list
@@ -475,6 +464,18 @@ Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 DUMPing parameters passed to llexec
 [1] 
+3: Using sleep as the remote shell
+3: Show machine names on output
+3: Adding machine 5,4,3,2,1 to list
+3: Setting forklimit to 3 and wait_shell to 0
+3: DUMPing parameters passed to llexec
+3: [3] 
+Using sleep as the remote shell
+Show machine names on output
+Adding machine 5,4,3,2,1 to list
+Setting forklimit to 3 and wait_shell to 0
+DUMPing parameters passed to llexec
+[3] 
 4: Using sleep as the remote shell
 4: Show machine names on output
 4: Adding machine 5,4,3,2,1 to list
@@ -506,14 +507,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 10:07:56 UTC 2007
+Sun May 27 11:56:59 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-a: a
-dsh: Process terminated (before write).
 b: b
 c: c
+dsh: Process terminated (before write).
+a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
diff --git a/testsuite/normal/pdebuild-normal-sid.log b/testsuite/normal/pdebuild-normal-sid.log
index f6efb71..433b077 100644
--- a/testsuite/normal/pdebuild-normal-sid.log
+++ b/testsuite/normal/pdebuild-normal-sid.log
@@ -422,10 +422,10 @@ success
 success
 success
 success
-a: dsh: Failed executing ./invalid-exec-file with llexec call
+c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
-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
@@ -437,7 +437,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 09:52:45 UTC 2007
+Sun May 27 11:24:01 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -507,7 +507,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
-Sun May 27 09:52:50 UTC 2007
+Sun May 27 11:24:06 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
diff --git a/testsuite/run-test.sh b/testsuite/run-test.sh
index a394a54..f2e083e 100755
--- a/testsuite/run-test.sh
+++ b/testsuite/run-test.sh
@@ -104,7 +104,7 @@ for DEBOOTSTRAP in debootstrap cdebootstrap; do
 	    -e "s,${testdir},/TESTDIR,g" \
 	    -e "s,^Current time:.*,Current time: TIME," \
 	    -e "s,^pbuilder-time-stamp: .*,pbuilder-time-stamp: XXXX," \
-	    -e "s,^Fetched .*[kM]B in .*s (.*[kM]B/s),Fetched XXXB in Xs (XXXXXB/s)," \
+	    -e "s,^Fetched .*B in .*s (.*B/s),Fetched XXXB in Xs (XXXXXB/s)," \
 	    -e "s,/var/cache/pbuilder/build//[0-9]*,/var/cache/pbuilder/build//NUM,g" \
 	    -e "s,\(/TESTDIR/dir[123]\)/[0-9]\+,\1/NUM,g" \
 	    < $A > ${A/.orig} && \