System information

# so we can rearrange this easily
processname=NetworkManager
@@ -34,17 +34,23 @@
start()
{
- echo $"Setting network parameters... "
+ echo -n $"Setting network param eters... "
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 --tim eout=$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
}
initscripts-8.45.19.EL-1.i386.rpm: /etc/sysconfig/network-scripts/network-
functions-ipv6
---
+++
@@ -138,14 +138,14 @ @
;;
'syslog')
# note: logger resides in /usr/bin, but not used by default
- if ! [ -x logger ]; then
+ if ! [ -x /usr/bin/logger ]; then
echo $"ERROR: [ipv6_log] Syslog is chosen, but binary 'logger' doesn't exist
or isn't executable" >/dev/stderr
return 3
fi
if [ -z "$txt_name" ]; then
- logger -p $facility.$priority $message
+ /usr/bin/logger -p $ facility.$priority $message
else
- logger -p $facility.$priority -t "$txt_nam e" "$ message"
+ /usr/bin/logger -p $ facility.$priority -t "$txt_name" "$message"
fi
;;
*)
nfs-utils-1.0.9-33.el5.i386.rpm: /etc/rc.d/init.d/nfs
---
+++
@@ -19,6 +19,9 @@
Red Hat Enterprise Linux 5 5.3 Release Notes
200