Author: bdubbs Date: 2006-09-10 18:41:47 -0600 (Sun, 10 Sep 2006) New Revision: 6298
Modified: trunk/BOOK/general.ent trunk/BOOK/introduction/welcome/changelog.xml trunk/bootscripts/ChangeLog trunk/bootscripts/blfs/init.d/nfs-server trunk/bootscripts/blfs/init.d/openldap1 trunk/bootscripts/blfs/init.d/openldap2 Log: Update nfs-server and openldap bootscripts to terminate properly Modified: trunk/BOOK/general.ent =================================================================== --- trunk/BOOK/general.ent 2006-09-10 23:08:44 UTC (rev 6297) +++ trunk/BOOK/general.ent 2006-09-11 00:41:47 UTC (rev 6298) @@ -35,7 +35,7 @@ <!ENTITY lfs-perl-version "5.8.8"> <!-- End LFS versions --> -<!ENTITY blfs-bootscripts-version "20060624"> +<!ENTITY blfs-bootscripts-version "20060910"> <!ENTITY blfs-bootscripts-download "&downloads-root;/blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2"> <!ENTITY blfs-wiki "http://wiki.linuxfromscratch.org/blfs/wiki";> Modified: trunk/BOOK/introduction/welcome/changelog.xml =================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml 2006-09-10 23:08:44 UTC (rev 6297) +++ trunk/BOOK/introduction/welcome/changelog.xml 2006-09-11 00:41:47 UTC (rev 6298) @@ -45,6 +45,10 @@ <para>September 10th, 2006</para> <itemizedlist> <listitem> + <para>[bdubbs] - Updated bootscripts to properly handle + non-TERM stop signals.</para> + </listitem> + <listitem> <para>[bdubbs] - Added creation of bin user to portmap.</para> </listitem> <listitem> Modified: trunk/bootscripts/ChangeLog =================================================================== --- trunk/bootscripts/ChangeLog 2006-09-10 23:08:44 UTC (rev 6297) +++ trunk/bootscripts/ChangeLog 2006-09-11 00:41:47 UTC (rev 6298) @@ -1,3 +1,8 @@ +2006-06-24 Bruce Dubbs <[EMAIL PROTECTED]> + * Updated the openldap and nfs-server scripts to pass appropriate + signals to the stop functions. This change was due to changes + in the LFS functions script on 2/06/05! + 2006-06-24 Randy McMurchy <[EMAIL PROTECTED]> * Updated the HAL script to work with HAL-0.5.7 Modified: trunk/bootscripts/blfs/init.d/nfs-server =================================================================== --- trunk/bootscripts/blfs/init.d/nfs-server 2006-09-10 23:08:44 UTC (rev 6297) +++ trunk/bootscripts/blfs/init.d/nfs-server 2006-09-11 00:41:47 UTC (rev 6298) @@ -48,12 +48,7 @@ boot_mesg "Stopping NFS nfsd..." # nfsd needs HUP.... - TEMPSTOPSIG="$STOPSIG" - STOPSIG="HUP" - ## Special case for nfsd with no full path - killproc nfsd - # return STOPSIG to it's orginal value... - STOPSIG="$TEMPSTOPSIG" + killproc nfsd HUP boot_mesg "Stopping NFS mountd..." killproc /usr/sbin/rpc.mountd Modified: trunk/bootscripts/blfs/init.d/openldap1 =================================================================== --- trunk/bootscripts/blfs/init.d/openldap1 2006-09-10 23:08:44 UTC (rev 6297) +++ trunk/bootscripts/blfs/init.d/openldap1 2006-09-11 00:41:47 UTC (rev 6298) @@ -23,8 +23,7 @@ boot_mesg "Stopping LDAP slapd Server..." PIDFILE="/srv/ldap/run/slapd.pid" # slapd needs SIGINT - STOPSIG="INT" - killproc -p ${PIDFILE} /usr/sbin/slapd + killproc -p ${PIDFILE} /usr/sbin/slapd INT ;; restart) Modified: trunk/bootscripts/blfs/init.d/openldap2 =================================================================== --- trunk/bootscripts/blfs/init.d/openldap2 2006-09-10 23:08:44 UTC (rev 6297) +++ trunk/bootscripts/blfs/init.d/openldap2 2006-09-11 00:41:47 UTC (rev 6298) @@ -28,12 +28,8 @@ boot_mesg "Stopping LDAP slapd Server..." PIDFILE="/srv/ldap/run/slapd.pid" # slapd needs SIGINT - TEMPSTOPSIG="$STOPSIG" - STOPSIG="INT" - killproc -p ${PIDFILE} /usr/sbin/slapd + killproc -p ${PIDFILE} /usr/sbin/slapd INT - # return STOPSIG to it's previous value - STOPSIG="$TEMPSTOPSIG" # return PIDFILE to nothing for slurpd PIDFILE="" -- http://linuxfromscratch.org/mailman/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
