Author: bdubbs Date: 2012-04-18 15:56:10 -0600 (Wed, 18 Apr 2012) New Revision: 9943
Modified: trunk/BOOK/general.ent trunk/BOOK/introduction/welcome/changelog.xml trunk/bootscripts/ChangeLog trunk/bootscripts/blfs/init.d/netfs trunk/bootscripts/blfs/init.d/nfs-server Log: Add cifs to netfs stop function. Remove obsolete kernel version tests in nfs-server. Modified: trunk/BOOK/general.ent =================================================================== --- trunk/BOOK/general.ent 2012-04-18 20:30:14 UTC (rev 9942) +++ trunk/BOOK/general.ent 2012-04-18 21:56:10 UTC (rev 9943) @@ -59,7 +59,7 @@ <!ENTITY lfs-vim-version "7.3"> <!-- End LFS versions --> -<!ENTITY blfs-bootscripts-version "20120409"> +<!ENTITY blfs-bootscripts-version "20120418"> <!ENTITY blfs-bootscripts-download "&downloads-root;/blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2"> <!ENTITY blfs-wiki "http://wiki.&lfs-domainname;/blfs/wiki";> Modified: trunk/BOOK/introduction/welcome/changelog.xml =================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml 2012-04-18 20:30:14 UTC (rev 9942) +++ trunk/BOOK/introduction/welcome/changelog.xml 2012-04-18 21:56:10 UTC (rev 9943) @@ -42,17 +42,26 @@ --> -<listitem> + <listitem> <para>April 18th, 2012</para> <itemizedlist> <listitem> + <para>[bdubbs] - Add cifs to stop procedure in nfs-server + boot script. Fixes + <ulink url="&blfs-ticket-root;3295">#3295</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Remove kernel version check from netfs + boot script.</para> + </listitem> + <listitem> <para>[rthomsen] - Removed several Perl modules and updated the - remaining modules to most recent versions. Fixes - <ulink url="&blfs-ticket-root;2649">#2649</ulink>.</para> + remaining modules to most recent versions. Fixes + <ulink url="&blfs-ticket-root;2649">#2649</ulink>.</para> </listitem> <listitem> <para>[rthomsen] - Removed PDL. Fixes - <ulink url="&blfs-ticket-root;2141">#2141</ulink>.</para> + <ulink url="&blfs-ticket-root;2141">#2141</ulink>.</para> </listitem> </itemizedlist> </listitem> @@ -62,7 +71,7 @@ <itemizedlist> <listitem> <para>[rthomsen] - Replaced the unmaintained Pine by Re-alpine 2.0.2. - Fixes <ulink url="&blfs-ticket-root;3312">#3312</ulink>.</para> + Fixes <ulink url="&blfs-ticket-root;3312">#3312</ulink>.</para> </listitem> <listitem> <para>[krejzi] - libgweather 3.4.1.</para> @@ -200,30 +209,30 @@ </listitem> <listitem> <para>[rthomsen] - Replace the use of the $QT4DIR variable with - $QTDIR, since only one version of Qt is currently in the book.</para> + $QTDIR, since only one version of Qt is currently in the book.</para> </listitem> <listitem> <para>[rthomsen] - Added sed for compiling Qca with GCC 4.7. Thanks - to Pierre Labastie for the report.</para> + to Pierre Labastie for the report.</para> </listitem> - <listitem> + <listitem> <para>[rthomsen] - Added sed for compiling Strigi with GCC 4.7. Thanks - to Pierre Labastie for the report.</para> + to Pierre Labastie for the report.</para> </listitem> <listitem> <para>[rthomsen] - Removed CLucene.</para> - </listitem> + </listitem> <listitem> <para>[rthomsen] - Upgrade to Soprano 2.7.5. Fixes <ulink url="&blfs-ticket-root;3318">#3318</ulink>.</para> - </listitem> - <listitem> + </listitem> + <listitem> <para>[rthomsen] - Added KDE configuration for the system-wide D-Bus - daemon.</para> + daemon.</para> </listitem> <listitem> <para>[rthomsen] - Fixed dependencies for VLC, Qt and Qca. Thanks - to Pierre Labastie for the report.</para> + to Pierre Labastie for the report.</para> </listitem> </itemizedlist> </listitem> @@ -348,14 +357,14 @@ <listitem> <para>April 6th, 2012</para> <itemizedlist> - <listitem> + <listitem> <para>[rthomsen] - Added wicd 1.7.1. Fixes - <ulink url="&blfs-ticket-root;3293">#3293</ulink>.</para> + <ulink url="&blfs-ticket-root;3293">#3293</ulink>.</para> </listitem> <listitem> <para>[rthomsen] - Upgrade to dhcpcd 5.5.6 and improve the dhcpcd - network service script to provide a cleaner boot message. Fixes - <ulink url="&blfs-ticket-root;3290">#3290</ulink>.</para> + network service script to provide a cleaner boot message. Fixes + <ulink url="&blfs-ticket-root;3290">#3290</ulink>.</para> </listitem> <listitem> <para>[rthomsen] - Disable building of libvpx static library.</para> @@ -363,7 +372,7 @@ <listitem> <para>[rthomsen] - Upgrade KDE section to 4.8.2.</para> </listitem> - <listitem> + <listitem> <para>[rthomsen] - Added Gwenview 4.8.2.</para> </listitem> <listitem> @@ -392,8 +401,8 @@ <itemizedlist> <listitem> <para>[rthomsen] - Upgrade to Virtuoso 6.1.5. Fixes - <ulink url="&blfs-ticket-root;3317">#3317</ulink>.</para> - </listitem> + <ulink url="&blfs-ticket-root;3317">#3317</ulink>.</para> + </listitem> </itemizedlist> </listitem> @@ -402,9 +411,9 @@ <itemizedlist> <listitem> <para>[rthomsen] - Upgrade to Qt 4.8.1 and add two patches. Fixes - <ulink url="&blfs-ticket-root;3320">#3320</ulink>.</para> - </listitem> - <listitem> + <ulink url="&blfs-ticket-root;3320">#3320</ulink>.</para> + </listitem> + <listitem> <para>[dj] - Xorg Applicatons require MesaLib. Fixes #3218.</para> </listitem> <listitem> Modified: trunk/bootscripts/ChangeLog =================================================================== --- trunk/bootscripts/ChangeLog 2012-04-18 20:30:14 UTC (rev 9942) +++ trunk/bootscripts/ChangeLog 2012-04-18 21:56:10 UTC (rev 9943) @@ -1,3 +1,7 @@ +2012-04-18 Bruce Dubbs <[email protected]> + * Add cifs to netfs stop function. + * Remove obsolete kernel version tests in nfs-server. + 2012-04-09 Bruce Dubbs <[email protected]> * Update network service scripts for consistency with LFS. Modified: trunk/bootscripts/blfs/init.d/netfs =================================================================== --- trunk/bootscripts/blfs/init.d/netfs 2012-04-18 20:30:14 UTC (rev 9942) +++ trunk/bootscripts/blfs/init.d/netfs 2012-04-18 21:56:10 UTC (rev 9943) @@ -47,7 +47,7 @@ # mount for all netfs types and anything that was # mounted with the _netdev option. NETMOUNTS=`/bin/mount \ - | /bin/grep '_netdev\|smbfs\|ncpfs\|coda\|nfs' \ + | /bin/grep '_netdev\|smbfs\|ncpfs\|coda\|nfs\|cifs' \ | /usr/bin/cut -d " " -f 3 | /bin/sed ':a;$!N;s/\n/ /;ta'` # Check to see if anything was listed from above @@ -81,7 +81,7 @@ # Now catch the rest of the network filesystems # by fstype. This list can be extended later as # more network filesystems are supported by mount. - /bin/umount -af -t coda,ncpfs,nfs,smbfs,nfsd + /bin/umount -af -t coda,ncpfs,nfs,smbfs,nfsd,cifs if [ $? = 0 -a $NERRVAL = 0 ]; then (exit 0) Modified: trunk/bootscripts/blfs/init.d/nfs-server =================================================================== --- trunk/bootscripts/blfs/init.d/nfs-server 2012-04-18 20:30:14 UTC (rev 9942) +++ trunk/bootscripts/blfs/init.d/nfs-server 2012-04-18 21:56:10 UTC (rev 9943) @@ -51,14 +51,6 @@ start_daemon /usr/sbin/rpc.mountd evaluate_retval - # NFSD support only in 2.6 kernel - /bin/uname -r | /bin/grep "^2.6" 2>&1 > /dev/null - if [ $? = 0 ]; then - log_info_msg "Mounting nfsd virtual filesystem..." - /bin/mount -t nfsd none /proc/fs/nfsd 2>&1 > /dev/null - evaluate_retval - fi - # Make certain that the list is refreshed on a restart. log_info_msg "Exporting NFS Filesystems..." /usr/sbin/exportfs -ra 2>&1 > /dev/null @@ -70,13 +62,9 @@ /usr/sbin/exportfs -au 2>&1 > /dev/null evaluate_retval - # NFSD support only in 2.6 kernel - /bin/uname -r | /bin/grep "2.6" 2>&1 > /dev/null - if [ $? = 0 ]; then - log_info_msg "Unmounting NFS Virtual Filesystem..." - /bin/umount /proc/fs/nfsd 2>&1 > /dev/null - evaluate_retval - fi + log_info_msg "Unmounting NFS Virtual Filesystem..." + /bin/umount /proc/fs/nfsd 2>&1 > /dev/null + evaluate_retval if [ "$QUOTAS" = "yes" ]; then log_info_msg "Stopping NFS rquotad..." -- http://linuxfromscratch.org/mailman/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
