mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-09-16 06:40:41 +00:00
Add bits to optionally block startup until a conneciton is made
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3744 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
69adda9b65
commit
0e1c398c66
|
@ -31,6 +31,9 @@ NETWORKMANAGER_BIN=${sbindir}/NetworkManager
|
||||||
# Source function library.
|
# Source function library.
|
||||||
. /etc/rc.d/init.d/functions
|
. /etc/rc.d/init.d/functions
|
||||||
|
|
||||||
|
# Source network configuration
|
||||||
|
. /etc/sysconfig/network
|
||||||
|
|
||||||
# so we can rearrange this easily
|
# so we can rearrange this easily
|
||||||
processname=NetworkManager
|
processname=NetworkManager
|
||||||
servicename=NetworkManager
|
servicename=NetworkManager
|
||||||
|
@ -51,6 +54,14 @@ start()
|
||||||
daemon --check $servicename $processname --pid-file=$pidfile
|
daemon --check $servicename $processname --pid-file=$pidfile
|
||||||
RETVAL=$?
|
RETVAL=$?
|
||||||
echo
|
echo
|
||||||
|
if [ -n "${NETWORKWAIT}" ]; then
|
||||||
|
[ -z "${LINKDELAY}" ] && LINKDELAY=10
|
||||||
|
echo -n $"Waiting for network..."
|
||||||
|
nm-online -q --timeout=$LINKDELAY || nm-online -q -x --timeout=30
|
||||||
|
[ "$?" = "0" ] && success "network startup" || failure "network startup"
|
||||||
|
echo
|
||||||
|
[ -n "${NETWORKDELAY}" ] && /bin/sleep ${NETWORKDELAY}
|
||||||
|
fi
|
||||||
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename
|
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue