[patch] Changes such that netmount goes down before networks do

netmount.diff (text/plain), 2.19 KB, created by Kevin F. Quinn (RETIRED) on 2004-12-22 08:39:36 UTC

--- netmount	2004-05-04 04:36:12.000000000 +0200
+++ /etc/init.d/netmount	2004-12-22 17:25:37.130191272 +0100
@@ -6,9 +6,12 @@
 depend() {
 	local myneed="net"
 	local myuse=""
+	# Add hotplug/pcmcia to capture dynamic network links
+	# (with "nets" below, this may not be necessary)
+	local myafter="hotplug pcmcia"
 	
 	#
-	# Only have Portmap as a dependency if there is a nfs mount in fstab
+	# Only have Portmap as a strict dependency if there is a nfs mount in fstab
 	# that should be mounted at boot time.  Also filter out comments.
 	#
 	local nfsmounts="$(awk '!/^#/ && $3 == "nfs" && $4 !~ /noauto/ { print $0 }' /etc/fstab)"
@@ -17,10 +20,20 @@
 	then
 		local myneed="${myneed} portmap"
 		local myuse="${myuse} nfs"
+	else
+		local myafter="${myafter} portmap nfs"
+	fi
+
+	# After all networks, regardless
+	local nets="$(ls /etc/init.d | grep '^net\.')"
+	if [ -n "${nets}" ]
+	then
+		local myfter="${myafter} ${nets}"
 	fi
 
 	need ${myneed}
 	use ${myuse}
+	after ${myafter}
 }
 
 start() {
@@ -31,9 +44,9 @@
 	# add portmap to the default runlevel.
 	if [ -L ${svcdir}/started/portmap ]
 	then
-		rcfilesystems="coda,nfs,ncpfs,smbfs"
+		rcfilesystems="coda,nfs,ncpfs,smbfs,cifs"
 	else
-		rcfilesystems="coda,ncpfs,smbfs"
+		rcfilesystems="coda,ncpfs,smbfs,cifs"
 	fi
 
 	ebegin "Mounting network filesystems"
@@ -55,7 +68,7 @@
 	#     else mount do not exit cleanly
 
 	local sig retry
-	local remaining="$(awk '$3 ~ /coda|nfs|ncpfs|smbfs/ { if ($2 != "/") print $2 }' /proc/mounts | sort -r)"
+	local remaining="$(awk '$3 ~ /coda|nfs|ncpfs|smbfs|cifs/ { if ($2 != "/") print $2 }' /proc/mounts | sort -r)"
 
 	# just keep things nice and uniform
 	if [ -z "${remaining}" ]
@@ -77,7 +90,7 @@
 	                        umount ${remaining} &>/dev/null
 	                        eend $? "Failed to unmount filesystems"
 	                fi
-	                remaining="$(awk '$3 ~ /coda|nfs|ncpfs|smbfs/ { if ($2 != "/") print $2 }' /proc/mounts | sort -r)"
+	                remaining="$(awk '$3 ~ /coda|nfs|ncpfs|smbfs|cifs/ { if ($2 != "/") print $2 }' /proc/mounts | sort -r)"
 	                [ -z "${remaining}" ] && break
 	                /bin/fuser -k -m ${sig} ${remaining} &>/dev/null
 	                sleep 5