2827e5129c
* initscript/RedHat/NetworkManager - Don't spit out sysctl stuff to console * libnm_glib/libnm_glib.c - (libnm_glib_init): call dbus_g_thread_init() * panel-applet/NMWirelessAppletDbus.c - (nmwa_dbus_worker): call dbus_g_thread_init() * src/NetworkManager.c - (main): call dbus_g_thread_init() * src/NetworkManagerAPList.c - (nm_ap_list_print_members): use LOG_ERR instead of LOG_DEBUG so we can actually see what's there in a normal syslog * src/NetworkManagerDevice.c - (nm_device_activate_wireless): print out the "waiting for access point" message only once, then say what access point we actually got after the wait. - (nm_device_need_ap_switch): If a scan is in progress when we're in this function, wait until the scan is done. Scans may change the ESSID of the card, making this function think we need to switch access points - (nm_device_wireless_process_scan_results): for artificial access points don't check against the card's ESSID, but the best_ap's ESSID. This prevents collisions with the scanning code, which may change the card's ESSID and cause the access point to get dropped from the device's AP list. Also increase the keep-around time to 2m from 60s since the max scan interval could be 60s in some cases. * src/NetworkManagerPolicy.c - (nm_policy_activation_finish): Don't add invalid MAC addresses to GConf - (nm_policy_allowed_ap_list_update): When we update, make sure we copy over the new properties and ESSIDs to the device's AP list. Fixes some races between NM and NMI. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@401 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
80 lines
1.4 KiB
Bash
Executable File
80 lines
1.4 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# NetworkManager: NetworkManager daemon
|
|
#
|
|
# chkconfig: - 98 02
|
|
# description: This is a daemon for automatically switching network \
|
|
# connections to the best available connection. \
|
|
#
|
|
# processname: NetworkManager
|
|
# pidfile: /var/run/NetworkManager.pid
|
|
#
|
|
|
|
# Sanity checks.
|
|
[ -x /usr/bin/NetworkManager ] || exit 1
|
|
|
|
# We need /sbin/ip
|
|
[ -x /sbin/ip ] || exit 1
|
|
|
|
# Source function library.
|
|
. /etc/rc.d/init.d/functions
|
|
|
|
# so we can rearrange this easily
|
|
processname=NetworkManager
|
|
servicename=NetworkManager
|
|
pidfile=/var/run/NetworkManager.pid
|
|
|
|
RETVAL=0
|
|
|
|
start()
|
|
{
|
|
echo $"Setting network parameters... "
|
|
sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
|
|
echo -n $"Starting NetworkManager daemon: "
|
|
daemon --check $servicename $processname
|
|
RETVAL=$?
|
|
echo
|
|
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename && echo `/sbin/pidof $processname` > $pidfile
|
|
}
|
|
|
|
stop()
|
|
{
|
|
echo -n $"Stopping NetworkManager daemon: "
|
|
|
|
killproc $servicename -TERM
|
|
RETVAL=$?
|
|
echo
|
|
if [ $RETVAL -eq 0 ]; then
|
|
rm -f /var/lock/subsys/$servicename
|
|
rm -f $pidfile
|
|
fi
|
|
}
|
|
|
|
# See how we were called.
|
|
case "$1" in
|
|
start)
|
|
start
|
|
;;
|
|
stop)
|
|
stop
|
|
;;
|
|
status)
|
|
status $processname
|
|
RETVAL=$?
|
|
;;
|
|
restart)
|
|
stop
|
|
start
|
|
;;
|
|
condrestart)
|
|
if [ -f /var/lock/subsys/$servicename ]; then
|
|
stop
|
|
start
|
|
fi
|
|
;;
|
|
*)
|
|
echo $"Usage: $0 {start|stop|status|restart|condrestart}"
|
|
;;
|
|
esac
|
|
exit $RETVAL
|