aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2010-05-13 16:18:51 -0400
committerBill Nottingham <notting@redhat.com>2010-05-13 16:19:31 -0400
commitff6e3cc495693a77e817bc3f94a1fa8e5a8f9770 (patch)
tree761c4279d88bee4581b191eb7cc9f51b0d589489 /rc.d
parentad03e23c39f9fa7b205dfe202d50d38c888393f4 (diff)
downloadinitscripts-ff6e3cc495693a77e817bc3f94a1fa8e5a8f9770.tar
initscripts-ff6e3cc495693a77e817bc3f94a1fa8e5a8f9770.tar.gz
initscripts-ff6e3cc495693a77e817bc3f94a1fa8e5a8f9770.tar.bz2
initscripts-ff6e3cc495693a77e817bc3f94a1fa8e5a8f9770.tar.xz
initscripts-ff6e3cc495693a77e817bc3f94a1fa8e5a8f9770.zip
Check for NetworkManager to be connected, not just running. (#589710, #592095)
Diffstat (limited to 'rc.d')
-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 6294aeb9..96bc117a 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 ] && [ ! -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" ] &&
{