aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2008-04-23 15:29:52 -0400
committerBill Nottingham <notting@redhat.com>2008-04-23 15:29:52 -0400
commit462db3ecfb1aad47105e6efccff9e55cef83f42f (patch)
treeed748be811fde6b23ef5446e530ccfb94cccf27e
parent37638eda01ac8743d6dbd85f1d699619571432a0 (diff)
downloadinitscripts-462db3ecfb1aad47105e6efccff9e55cef83f42f.tar
initscripts-462db3ecfb1aad47105e6efccff9e55cef83f42f.tar.gz
initscripts-462db3ecfb1aad47105e6efccff9e55cef83f42f.tar.bz2
initscripts-462db3ecfb1aad47105e6efccff9e55cef83f42f.tar.xz
initscripts-462db3ecfb1aad47105e6efccff9e55cef83f42f.zip
do a much better check for network availability
Avoids nasty 'FAILED' messages when using NetworkManager.
-rwxr-xr-xrc.d/init.d/netfs4
1 files changed, 1 insertions, 3 deletions
diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs
index 6769c132..1ad100bb 100755
--- a/rc.d/init.d/netfs
+++ b/rc.d/init.d/netfs
@@ -17,9 +17,6 @@
. /etc/init.d/functions
. /etc/sysconfig/network
-# Check that networking is up.
-[ "${NETWORKING}" = "no" ] && exit 0
-
NFSFSTAB=`LC_ALL=C awk '!/^#/ && $3 ~ /^nfs/ && $3 != "nfsd" && $4 !~ /noauto/ { print $2 }' /etc/fstab`
SMBFSTAB=`LC_ALL=C awk '!/^#/ && $3 == "smbfs" && $4 !~ /noauto/ { print $2 }' /etc/fstab`
CIFSFSTAB=`LC_ALL=C awk '!/^#/ && $3 == "cifs" && $4 !~ /noauto/ { print $2 }' /etc/fstab`
@@ -35,6 +32,7 @@ NETDEVMTAB=`LC_ALL=C awk '$4 ~ /_netdev/ && $2 != "/" { print $2 }' /etc/mtab`
# See how we were called.
case "$1" in
start)
+ [ ! -f /var/lock/subsys/network -a ! -f /var/lock/subsys/NetworkManager ] && exit 0
[ -n "$NFSFSTAB" ] &&
{
[ ! -f /var/lock/subsys/rpcbind ] && service rpcbind start