b975c9c9f2
during association; wait until the entire assocation times out
- Replace dispatcher daemon with D-Bus activated callout
- Fix parsing of DNS2 and DNS3 ifcfg file items
- Execute dispatcher scripts in alphabetical order
- Be active at runlevel 2
- Hook up MAC address widgets for wired & wireless; and BSSID widget for
wireless
- Pre-populate anonymous identity and phase2 widgets correctly
- Clear out unused connection keys from GConf
28 lines
918 B
Diff
28 lines
918 B
Diff
--- NetworkManager-0.7.0/initscript/RedHat/NetworkManager.in 2008-04-05 12:17:55.000000000 -0400
|
|
+++ NetworkManager-0.7.0/initscript/RedHat/NetworkManager.in 2008-04-16 13:10:41.000000000 -0400
|
|
@@ -34,6 +34,9 @@
|
|
# Source function library.
|
|
. /etc/rc.d/init.d/functions
|
|
|
|
+# Source network configuration
|
|
+. /etc/sysconfig/network
|
|
+
|
|
# so we can rearrange this easily
|
|
processname=NetworkManager
|
|
servicename=NetworkManager
|
|
@@ -50,6 +53,14 @@
|
|
daemon --check $servicename $processname --pid-file=$pidfile
|
|
RETVAL=$?
|
|
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
|
|
}
|
|
|