Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/2_9/360-2.8-nscd-one-fork.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Fri Mar 27 23:40:07 2009 +0000 (2009-03-27)
changeset 1272 ddac62e7c428
permissions -rw-r--r--
Only create the state dir if asked for a restartable build:
- introduce the config dir, where components can store their config files
- move the munged uClibc config file to the config dir
- now, the state dir really is an indication that a build can be restarted

Thanks to Groleo Marius <groleo@gmail.com> for spotting the inconsistency
of the state dir usage, and suggesting this change.

/trunk/scripts/build/libc/uClibc.sh | 6 3 3 0 +++---
/trunk/scripts/crosstool-NG.sh.in | 9 7 2 0 +++++++--
/trunk/scripts/functions | 15 12 3 0 ++++++++++++---
3 files changed, 22 insertions(+), 8 deletions(-) 
     1 Original patch from: gentoo/src/patchsets/glibc/2.9/1160_all_glibc-2.8-nscd-one-fork.patch

     2 

     3 -= BEGIN original header =-

     4 only fork one to assist in stop-start-daemon assumptions about daemon behavior

     5 

     6 http://bugs.gentoo.org/190785

     7 

     8 -= END original header =-

     9 

    10 diff -durN glibc-2_9.orig/nscd/nscd.c glibc-2_9/nscd/nscd.c

    11 --- glibc-2_9.orig/nscd/nscd.c	2008-03-29 19:08:12.000000000 +0100

    12 +++ glibc-2_9/nscd/nscd.c	2009-02-02 22:01:10.000000000 +0100

    13 @@ -179,6 +179,9 @@

    14        if (pid != 0)

    15  	exit (0);

    16  

    17 +       if (write_pid (_PATH_NSCDPID) < 0)

    18 +	dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));

    19 +

    20        int nullfd = open (_PATH_DEVNULL, O_RDWR);

    21        if (nullfd != -1)

    22  	{

    23 @@ -228,12 +231,6 @@

    24  	for (i = min_close_fd; i < getdtablesize (); i++)

    25  	  close (i);

    26  

    27 -      pid = fork ();

    28 -      if (pid == -1)

    29 -	error (EXIT_FAILURE, errno, _("cannot fork"));

    30 -      if (pid != 0)

    31 -	exit (0);

    32 -

    33        setsid ();

    34  

    35        if (chdir ("/") != 0)

    36 @@ -242,9 +239,6 @@

    37  

    38        openlog ("nscd", LOG_CONS | LOG_ODELAY, LOG_DAEMON);

    39  

    40 -      if (write_pid (_PATH_NSCDPID) < 0)

    41 -        dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));

    42 -

    43        if (!init_logfile ())

    44  	dbg_log (_("Could not create log file"));

    45
crosstool-ng