cvs commit: BLFS/BOOK/postlfs/config netfs.xml

igor at linuxfromscratch.org igor at linuxfromscratch.org
Mon Jan 26 14:40:38 PST 2004


igor        04/01/26 15:40:37

  Modified:    BOOK/introduction/welcome changelog.xml
               BOOK/postlfs/config netfs.xml
  Log:
  applied DJ's netfs patch
  
  Revision  Changes    Path
  1.916     +4 -0      BLFS/BOOK/introduction/welcome/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/introduction/welcome/changelog.xml,v
  retrieving revision 1.915
  retrieving revision 1.916
  diff -u -r1.915 -r1.916
  --- changelog.xml	26 Jan 2004 22:29:15 -0000	1.915
  +++ changelog.xml	26 Jan 2004 22:40:37 -0000	1.916
  @@ -11,6 +11,10 @@
   
   <itemizedlist>
   
  +<listitem><para>January 26th, 2004 [igor]: Patched netfs init
  +script, contributed by DJ Lucas and Gabriel
  +Munoz.</para></listitem>
  +
   <listitem><para>January 26th, 2004 [igor]: Updated to
   MPlayer-1.0pre3.</para></listitem>
   
  
  
  
  1.2       +26 -4     BLFS/BOOK/postlfs/config/netfs.xml
  
  Index: netfs.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/postlfs/config/netfs.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- netfs.xml	18 Dec 2003 00:52:57 -0000	1.1
  +++ netfs.xml	26 Jan 2004 22:40:37 -0000	1.2
  @@ -46,7 +46,7 @@
                                                                                   
                   # Check to see if anything was listed from above
                   # (see if anything is actually needs to be unmounted)
  -                if [ x$NETMOUNTS != x ]
  +                if [ x"$NETMOUNTS" != x ]
                   then
                           # There is something mounted
                           # terminate the echo -n above
  @@ -66,9 +66,31 @@
                                   fuser -km $NETMOUNTS > /dev/null
                           fi
                                                                                   
  -                        # unmount our list
  -                        umount $NETMOUNTS
  -                        evaluate_retval
  +                        # We now need to unmount all network filesystems.
  +			# We will do this with two umount commands to allow
  +			# for broken behavior of smbmount, and also to make
  +			# certain that netmounts without the _netdev option
  +			# will still get unmounted.
  +                        umount -a -O _netdev
  +                        # save the retval
  +			if [ $? != 0 ]
  +			then
  +				NERRVAL=1
  +			fi
  +
  +			# Now catch the rest of the network filesystems
  +			# by fstype.  This list can be extended later as
  +			# more network filesystems are supported by mount.
  +			umount -a -t coda,ncpfs,nfs,smbfs
  +			if [ $? == 0]
  +			then
  +				[ -z $NERRVAL ]
  +				evaluate_retval
  +			else
  +				# make certain that we return an error
  +				/bin/false		
  +				evaluate_retval
  +			fi
                   else
                           # There is nothing mounted
                           echo "No network volumes mounted!"
  
  
  



More information about the blfs-book mailing list