Don't touch nfs if we have separate nfsfs script.

svn-id: @11928

diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs
index 708cd62bb5563531a8ab0a754f1e96abe547f143..7bd6baab270ef05ba27aaaafd153f0f5aaddad02 100755 (executable)
--- a/rc.d/init.d/netfs
+++ b/rc.d/init.d/netfs
@@ -14,7 +14,12 @@
 . /etc/init.d/functions
 . /etc/sysconfig/network
 
-NFSFSTAB=$(LC_ALL=C awk '!/^#/ && $3 ~ /^nfs/ && $3 != "nfsd" && $4 !~ /noauto/ { print $2 }' /etc/fstab)
+# nfs uses own script for that
+if [ ! -f /etc/rc.d/init.d/nfsfs ]; then
+       NFSFSTAB=$(LC_ALL=C awk '!/^#/ && $3 ~ /^nfs/ && $3 != "nfsd" && $4 !~ /noauto/ { print $2 }' /etc/fstab)
+       NFSMTAB=$(LC_ALL=C awk '$3 ~ /^nfs/ && $3 != "nfsd" && $2 != "/" { print $2 }' /proc/mounts)
+fi
+
 CIFSFSTAB=$(LC_ALL=C awk '!/^#/ && $3 == "cifs" && $4 !~ /noauto/ { print $2 }' /etc/fstab)
 NCPFSTAB=$(LC_ALL=C awk '!/^#/ && $3 == "ncpfs" && $4 !~ /noauto/ { print $2 }' /etc/fstab)
 NETDEVFSTAB=$(LC_ALL=C awk '!/^#/ && $4 ~/_netdev/ && $4 !~ /noauto/ { print $1 }' /etc/fstab)