aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2010-05-13 16:20:34 -0400
committerBill Nottingham <notting@redhat.com>2010-05-13 16:20:34 -0400
commit2679e5006d40c7f99f933b1265b9487bec772fa0 (patch)
treedd2addac42a480691a37efafecc2e2c5a5282814
parentc3b4dadc41525165341442fb7cfd1c27de19c49d (diff)
downloadinitscripts-2679e5006d40c7f99f933b1265b9487bec772fa0.tar
initscripts-2679e5006d40c7f99f933b1265b9487bec772fa0.tar.gz
initscripts-2679e5006d40c7f99f933b1265b9487bec772fa0.tar.bz2
initscripts-2679e5006d40c7f99f933b1265b9487bec772fa0.tar.xz
initscripts-2679e5006d40c7f99f933b1265b9487bec772fa0.zip
Check for NetworkManager to be connected, not just running. (#589710, #592095)
-rwxr-xr-xrc.d/init.d/netfs2
1 files changed, 1 insertions, 1 deletions
diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs
index 17cea9f8..9fe131d4 100755
--- a/rc.d/init.d/netfs
+++ b/rc.d/init.d/netfs
@@ -32,7 +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
+ [ ! -f /var/lock/subsys/network ] && ! nm-online -x >/dev/null 2>&1 && exit 0
[ "$EUID" != "0" ] && exit 4
[ -n "$NFSFSTAB" ] &&
{