[d-i-commits] r32189 - in trunk/packages/base-installer: . debian

[Joey Hess]

Author: joeyh
Date: 2005-11-16 21:46:40 +0000 (Wed, 16 Nov 2005)
New Revision: 32189

Modified:
   trunk/packages/base-installer/debian/changelog
   trunk/packages/base-installer/run-debootstrap.c
Log:
* Remove sigchld handler in run_debootstrap. It caused it to stop processing
  before it got to debootstrap error messages, so useful error messages
  were not displayed. Closes: #337191

Modified: trunk/packages/base-installer/debian/changelog
===================================================================
--- trunk/packages/base-installer/debian/changelog	2005-11-16 21:46:22 UTC (rev 32188)
+++ trunk/packages/base-installer/debian/changelog	2005-11-16 21:46:40 UTC (rev 32189)
@@ -1,3 +1,11 @@
+base-installer (1.37) UNRELEASED; urgency=low
+
+  * Remove sigchld handler in run_debootstrap. It caused it to stop processing
+    before it got to debootstrap error messages, so useful error messages
+    were not displayed. Closes: #337191
+
+ -- Joey Hess <joeyh at debian.org>  Wed, 16 Nov 2005 14:19:17 -0500
+
 base-installer (1.36) unstable; urgency=low
 
   [ Joey Hess ]

Modified: trunk/packages/base-installer/run-debootstrap.c
===================================================================
--- trunk/packages/base-installer/run-debootstrap.c	2005-11-16 21:46:22 UTC (rev 32188)
+++ trunk/packages/base-installer/run-debootstrap.c	2005-11-16 21:46:40 UTC (rev 32189)
@@ -3,7 +3,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <signal.h>
 #include <string.h>
 #include <ctype.h>
 
@@ -14,16 +13,9 @@
 
 #define DEBCONF_BASE          "base-installer/debootstrap/"
 
-volatile int child_exit = 0;
 struct debconfclient *debconf = NULL;
 int progress_start_position = 0;
 
-static void
-sig_child(int sig)
-{
-    child_exit = 1;
-}
-
 /* args = read_arg_lines("EA: ", ifp, &arg_count, &line); */
 char **
 read_arg_lines(const char *prefix, FILE *ifp, int *arg_count, char **final_line,
@@ -164,6 +156,7 @@
     int llen;
     size_t dummy = 0;
     int current_section = 0;
+    int child_exit = 0;
 
     pipe(from_db);
 
@@ -195,8 +188,6 @@
         return -1;
     }
 
-    signal(SIGCHLD, &sig_child);
-
     progress_start_position = get_progress_start_position();
 
     close(from_db[1]);