1
0
mirror of https://github.com/gryf/wicd.git synced 2026-04-19 04:13:30 +02:00

Modified two initscripts to support wicd -k, made wicd -k have a non-zero exit code if it can't find a daemon to kill.

This commit is contained in:
Andrew Psaltis
2009-12-29 21:22:23 -05:00
parent ff6cca2528
commit 49ed9f6251
4 changed files with 37 additions and 10 deletions

View File

@@ -3,7 +3,7 @@
# /etc/rc.d/rc.wicd
# Start/stop/restart the Wicd daemon
# This is defined in /usr/lib/python2.5/site-packages/wicd/wpath.py
# This is defined in /usr/lib/python2.6/site-packages/wicd/wpath.py
PIDFILE="%PIDFILE%"
DAEMON="%SBIN%wicd"
@@ -21,7 +21,7 @@ wicd_start() {
fi
}
wicd_stop() {
wicd_force_stop() {
echo "Stopping wicd daemon..."
if [ -e $PIDFILE ]; then
kill $(cat $PIDFILE) 2>/dev/null
@@ -31,6 +31,12 @@ wicd_stop() {
fi
}
wicd_stop() {
echo "Stopping wicd daemon and closing connections..."
$DAEMON -k
}
# See how we were called and take appropriate action
case $1 in
@@ -40,8 +46,11 @@ case $1 in
stop)
wicd_stop
;;
restart)
force_stop)
wicd_stop
;;
restart)
wicd_force_stop
wicd_start
;;
*)