Author: glen Date: Sun Sep 17 17:49:36 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- suspend is builtin command
---- Files affected:
SOURCES:
ifplugd.init (1.7 -> 1.8)
---- Diffs:
================================================================
Index: SOURCES/ifplugd.init
diff -u SOURCES/ifplugd.init:1.7 SOURCES/ifplugd.init:1.8
--- SOURCES/ifplugd.init:1.7 Sun Sep 17 19:47:34 2006
+++ SOURCES/ifplugd.init Sun Sep 17 19:49:31 2006
@@ -55,18 +55,6 @@
rm -f /var/run/ifplugd.pid /var/lock/subsys/ifplugd.* >/dev/null 2>&1
}
-suspend() {
- for iface in $INTERFACES; do
- if [ -f /var/lock/subsys/ifplugd.${iface} ]; then
- msg_stopping "Network Interface Plugging Daemon
(suspending $iface)"
- daemon /sbin/ifplugd -S -i ${iface}
- RETVAL=$?
- else
- msg_not_running "ifplugd ($iface)"
- fi
- done
-}
-
resume() {
for iface in $INTERFACES; do
if [ -f /var/lock/subsys/ifplugd.${iface} ]; then
@@ -79,18 +67,6 @@
done
}
-reload() {
- if [ -f /var/lock/subsys/ifplugd ]; then
- $0 stop
- sleep 2
- $0 start
- RETVAL=$?
- else
- msg_not_running ifplugd
- exit 7
- fi
-}
-
[ -n "$2" ] && INTERFACES="$2"
[ -z "$INTERFACES" -o "$INTERFACES" = "auto" ] && INTERFACES=$(awk -F:
'/(eth|wlan)/ { print $1 }' /proc/net/dev | xargs)
@@ -105,7 +81,15 @@
stop
;;
suspend)
- suspend
+ for iface in $INTERFACES; do
+ if [ -f /var/lock/subsys/ifplugd.${iface} ]; then
+ msg_stopping "Network Interface Plugging Daemon
(suspending $iface)"
+ daemon /sbin/ifplugd -S -i ${iface}
+ RETVAL=$?
+ else
+ msg_not_running "ifplugd ($iface)"
+ fi
+ done
;;
resume)
resume
@@ -125,7 +109,15 @@
done
;;
reload|force-reload)
- reload
+ if [ -f /var/lock/subsys/ifplugd ]; then
+ stop
+ sleep 2
+ start
+ RETVAL=$?
+ else
+ msg_not_running ifplugd
+ exit 7
+ fi
;;
*)
msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/ifplugd.init?r1=1.7&r2=1.8&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
