SVN: rc-scripts/trunk/rc.d/init.d: Makefile.am network

[arekm]

Author: arekm
Date: Fri Dec  3 11:37:12 2010
New Revision: 11933

Modified:
   rc-scripts/trunk/rc.d/init.d/Makefile.am
   rc-scripts/trunk/rc.d/init.d/network
Log:
Bring in netfs.

Modified: rc-scripts/trunk/rc.d/init.d/Makefile.am
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/Makefile.am	(original)
+++ rc-scripts/trunk/rc.d/init.d/Makefile.am	Fri Dec  3 11:37:12 2010
@@ -6,6 +6,7 @@
 	allowlogin \
 	cpusets \
 	killall \
+	netfs \
 	network \
 	random \
 	single \

Modified: rc-scripts/trunk/rc.d/init.d/network
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/network	(original)
+++ rc-scripts/trunk/rc.d/init.d/network	Fri Dec  3 11:37:12 2010
@@ -223,17 +223,6 @@
 		if [ -x /etc/rc.d/init.d/netfs -a -f /var/lock/subsys/netfs ];
 		then
 			/etc/rc.d/init.d/netfs stop
-		else
-			netmtab=$(awk '{ if ($3 ~ /^(smbfs|ncpfs|cifs)$/ ) print $3}' /proc/mounts)
-			if (echo "$netmtab" | grep -q smbfs); then
-				run_cmd "Unmounting SMB filesystems" umount -at smbfs
-			fi
-			if (echo "$netmtab" | grep -q ncpfs); then
-				run_cmd "Unmounting NCP filesystems" umount -at ncpfs
-			fi
-			if (echo "$netmtab" | grep -q cifs); then
-				run_cmd "Unmounting CIFS filesystems" umount -at cifs
-			fi
 		fi
 	fi