Author: arekm
Date: Fri Dec 3 11:15:43 2010
New Revision: 11928
Modified:
rc-scripts/trunk/rc.d/init.d/netfs
Log:
Don't touch nfs if we have separate nfsfs script.
Modified: rc-scripts/trunk/rc.d/init.d/netfs
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/netfs (original)
+++ rc-scripts/trunk/rc.d/init.d/netfs Fri Dec 3 11:15:43 2010
@@ -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)
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
