+

+	* pbuilder-modules (pbuilder-options): actually, return 101 for policy-rc.d
+
+	* debian/TODO: update
+
+	* pbuilder-modules (pbuilder-options): install policy-rc.d inside chroot if it does not exist,
+	and make it a dummy exit-all one.
+
+	* THANKS: add Aaron here.
+
+	* pbuilder-buildpackage (PACKAGENAME): use echo here, so that su won't
+	mess up the command-line. c.f. 203584, "Aaron M. Ucko" <ucko@debian.org>
+

7 files changed, 41 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index f982cf1..273f949 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2003-09-24  Junichi Uekawa  <dancer@debian.org>
+
+	* pbuilder-modules (pbuilder-options): actually, return 101 for policy-rc.d
+
+	* debian/TODO: update
+
+	* pbuilder-modules (pbuilder-options): install policy-rc.d inside chroot if it does not exist,
+	and make it a dummy exit-all one.
+
+	* THANKS: add Aaron here.
+
+	* pbuilder-buildpackage (PACKAGENAME): use echo here, so that su won't 
+	mess up the command-line. c.f. 203584, "Aaron M. Ucko" <ucko@debian.org>
+
 2003-09-23  Junichi Uekawa  <dancer@debian.org>
 
 	* debian/TODO: update
diff --git a/THANKS b/THANKS
index 88fa7c4..0334bc3 100644
--- a/THANKS
+++ b/THANKS
@@ -31,6 +31,7 @@ Marek Habersack <grendel@debian.org>
 Kenneth Pronovici <pronovic@debian.org>
 Matt Kraai <kraai@alumni.cmu.edu>
 Roland Stigge
+"Aaron M. Ucko" <ucko@debian.org>
 
 I thank them all!
 
diff --git a/debian/TODO b/debian/TODO
index e05e975..801439d 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -21,12 +21,11 @@ TODO and possible bugs:
    - putting example scripts.
          
 * Supporting really automatic/noninteractive "pbuilder upgrade"
-   - making "start-stop-daemon" to be a dummy script?
-   - using policy-rc.d ? Get people to use invoke-rc.d?
-   - Killing any processes that are left over ? 
    - user-mode-linux is noninteractive, it no longer umounts.
+   - policy-rc.d is in place, everything should be automatic modulo bugs.
 
 * $HOME, $TMP, $TMPDIR, etc. environment vars are set to bogus values
+
 * set LOGNAME=root ?
 
 * check cross-compile support, maybe adding support for dpkg-cross into build-depends checker?
diff --git a/debian/changelog b/debian/changelog
index da29c34..e91463a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,15 @@ pbuilder (0.87) UNRELEASED; urgency=low
   * Bug fix: "pdebuild continues after source package fails to build",
     thanks to Matt Kraai (Closes: #211108).
   * UML: Add --mirror and --nonusmirror options.
-
- -- Junichi Uekawa <dancer@debian.org>  Tue, 23 Sep 2003 08:46:07 +0900
+  * Bug fix: "pbuilder: mishandles multiword DEBEMAIL", thanks to Aaron
+    M. Ucko (Closes: #203584).
+  * create policy-rc.d inside chroot if it does not exist, to fix
+    "start-stop-daemon should not start any daemon inside chroot"
+    (Closes: #165430)  
+  * Testsuite is added to the source tree, to get some kind of automatic 
+    regression testing.
+  
+ -- Junichi Uekawa <dancer@debian.org>  Wed, 24 Sep 2003 07:20:47 +0900
 
 pbuilder (0.86) unstable; urgency=low
 
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 4ce3a06..08ff073 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -94,7 +94,7 @@ fi
 
 (
     : Build process
-    $CHROOTEXEC /bin/bash -c "${DPKG_COMMANDLINE}"
+    echo  "${DPKG_COMMANDLINE}" | $CHROOTEXEC /bin/bash
 ) &
 BUILD_PID=$!
 if [ -n "${TIMEOUT_TIME}" ]; then
diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv
index f267616..6888aa1 100755
--- a/pbuilder-createbuildenv
+++ b/pbuilder-createbuildenv
@@ -59,7 +59,6 @@ mkdir -p "$BUILDPLACE/tmp/buildd"
 
 
 copy_local_configuration
-
 installaptlines
 
 echo "Refreshing the base.tgz "
diff --git a/pbuilder-modules b/pbuilder-modules
index 7f7f821..6ca72fa 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -113,6 +113,9 @@ function umountproc () {
     done
 }
 
+
+# Mount /proc /dev/pts /dev and bind-mount points
+# Also create a policy-rc.d script if it doesn't already exist.
 function mountproc () {
     if [ "$USEPROC" = "yes" ]; then
 	echo " -> mounting /proc filesystem"
@@ -134,6 +137,17 @@ function mountproc () {
 	mkdir -p "$BUILDPLACE/$mnt"
 	mount -obind "$mnt" "$BUILDPLACE/$mnt"
     done
+    if [ -f "$BUILDPLACE/usr/sbin/policy-rc.d" ]; then
+	echo " -> policy-rc.d already exists"
+    else
+	echo " -> installing dummy policy-rc.d"
+	echo "\
+#!/bin/sh
+
+exit 101
+" >  "$BUILDPLACE/usr/sbin/policy-rc.d" 
+	chmod a+x "$BUILDPLACE/usr/sbin/policy-rc.d" 
+    fi
 }
 
 ## function to clean subdirs, use instead of rm -r