Installation guide

Configuration Changes From Previous Release
229
-# connections to the best available connection. \
+# connections to the best available connection.
#
# processname: NetworkManager
# pidfile: /var/run/NetworkManager/NetworkManager.pid
@@ -19,11 +19,11 @@
# Sanity checks.
[ -x $NETWORKMANAGER_BIN ] || exit 1
-# We need /sbin/ip
-[ -x /sbin/ip ] || exit 1
-
# Source function library.
. /etc/rc.d/init.d/functions
+
+# Source network configuration
+. /etc/sysconfig/network
# so we can rearrange this easily
processname=NetworkManager
@@ -34,17 +34,23 @@
start()
{
- echo $"Setting network parameters... "
+ echo -n $"Setting network parameters... "
sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
-
- if [ ! -e /var/lock/subsys/dhcdbd ]; then
- service dhcdbd start
- fi
+ success
+ echo
echo -n $"Starting NetworkManager daemon: "
- daemon --check $servicename $processname --pid-file=$pidfile
+ daemon --check $servicename $processname --pid-file=$pidfile --ppp-dns-
workaround
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
}