diff -up NetworkManager-0.7.0/initscript/RedHat/NetworkManager.in.wait-for-network NetworkManager-0.7.0/initscript/RedHat/NetworkManager.in
--- NetworkManager-0.7.0/initscript/RedHat/NetworkManager.in.wait-for-network	2008-04-24 11:49:01.000000000 -0400
+++ NetworkManager-0.7.0/initscript/RedHat/NetworkManager.in	2008-04-27 21:51:07.000000000 -0400
@@ -2,7 +2,7 @@
 #
 # NetworkManager:   NetworkManager daemon
 #
-# chkconfig: - 27 73
+# chkconfig: - 98 02
 # description:  This is a daemon for automatically switching network \
 #               connections to the best available connection.
 #
@@ -10,7 +10,7 @@
 # pidfile: /var/run/NetworkManager/NetworkManager.pid
 #
 ### BEGIN INIT INFO
-# Provides: network_manager $network
+# Provides: network_manager
 # Required-Start: messagebus haldaemon
 # Required-Stop: messagebus haldaemon
 # Default-Start: 2 3 4 5
@@ -34,6 +34,9 @@ NETWORKMANAGER_BIN=${sbindir}/NetworkMan
 # 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
@@ -52,6 +55,14 @@ start()
 	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
 }