Author: bdubbs Date: 2006-04-11 01:14:41 -0600 (Tue, 11 Apr 2006) New Revision: 5844
Modified: trunk/BOOK/general.ent trunk/bootscripts/blfs/init.d/netfs trunk/bootscripts/blfs/init.d/sshd Log: Updated sshd bootscript to prevent out of memory. Fixed netfs bootscript to properly shutdown. Modified: trunk/BOOK/general.ent =================================================================== --- trunk/BOOK/general.ent 2006-04-11 02:07:36 UTC (rev 5843) +++ trunk/BOOK/general.ent 2006-04-11 07:14:41 UTC (rev 5844) @@ -34,7 +34,7 @@ <!ENTITY lfs-perl-version "5.8.8"> <!-- End LFS versions --> -<!ENTITY blfs-bootscripts-version "20060205"> +<!ENTITY blfs-bootscripts-version "20060411"> <!ENTITY blfs-bootscripts-download "&downloads-root;/blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2"> <!ENTITY blfs-wiki "http://wiki.linuxfromscratch.org/blfs/wiki";> Modified: trunk/bootscripts/blfs/init.d/netfs =================================================================== --- trunk/bootscripts/blfs/init.d/netfs 2006-04-11 02:07:36 UTC (rev 5843) +++ trunk/bootscripts/blfs/init.d/netfs 2006-04-11 07:14:41 UTC (rev 5844) @@ -29,8 +29,8 @@ # mount for all netfs types and anything that was # mounted with the _netdev option. NETMOUNTS=`/bin/mount \ - | /bin/grep '_netdev\|smbfs\|ncpfs|\coda\|nfs' \ - | /usr/bin/cut -d " " -f 3 | /bin/sed 's/$/ /g'` + | /bin/grep '_netdev\|smbfs\|ncpfs\|coda\|nfs' \ + | /usr/bin/cut -d " " -f 3 | /bin/sed ':a;$!N;s/\n/ /;ta'` # Check to see if anything was listed from above # (see if anything is actually needs to be unmounted) @@ -42,7 +42,7 @@ # Try and stop processes the nice way # (probably won't work in most cases) - /bin/fuser -m -SIGTERM $NETMOUNTS > /dev/null + /bin/fuser -SIGTERM -km $NETMOUNTS > /dev/null # Check and see if it found anything. If it # did, then give 3 seconds for things to exit Modified: trunk/bootscripts/blfs/init.d/sshd =================================================================== --- trunk/bootscripts/blfs/init.d/sshd 2006-04-11 02:07:36 UTC (rev 5843) +++ trunk/bootscripts/blfs/init.d/sshd 2006-04-11 07:14:41 UTC (rev 5844) @@ -13,7 +13,8 @@ case "$1" in start) boot_mesg "Starting SSH Server..." - loadproc /usr/sbin/sshd + # Also prevent ssh from being killed by out of memory conditions + loadproc /usr/sbin/sshd && echo "-16" >/proc/`cat /var/run/sshd.pid`/oom_adj ;; stop) -- http://linuxfromscratch.org/mailman/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
