Author: glen Date: Tue Nov 17 22:34:50 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- cosmetics; add try-restart
---- Files affected:
packages/powersave:
powersave.init (1.13 -> 1.14)
---- Diffs:
================================================================
Index: packages/powersave/powersave.init
diff -u packages/powersave/powersave.init:1.13
packages/powersave/powersave.init:1.14
--- packages/powersave/powersave.init:1.13 Tue Nov 17 23:31:20 2009
+++ packages/powersave/powersave.init Tue Nov 17 23:34:45 2009
@@ -23,6 +23,11 @@
GOVS="ondemand powersave performance userspace"
start() {
+ if [ -f /var/lock/subsys/powersave ]; then
+ msg_already_running "Powersaved"
+ return
+ fi
+
# Load default cpufreq module
if is_yes "$CPUFREQ_ENABLED"; then
if [ -n "$CPUFREQD_MODULE" ]; then
@@ -37,28 +42,47 @@
fi
# Start daemons.
- if [ ! -f /var/lock/subsys/powersave ]; then
- # starting:
- msg_starting powersave
- daemon powersaved -d -f $ACPI_EVENT_FILE $PROGRAM_ARGS
- RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/powersave
- else
- msg_already_running powersave
- fi
+ msg_starting "Powersaved"
+ daemon powersaved -d -f $ACPI_EVENT_FILE $PROGRAM_ARGS
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/powersave
}
stop() {
# Stop daemons.
+ if [ ! -f /var/lock/subsys/powersave ]; then
+ msg_not_running "Powersaved"
+ return
+ fi
+
+ msg_stopping "Powersaved"
+ killproc powersaved
+ rm -f /var/lock/subsys/powersave >/dev/null 2>&1
+}
+
+reload() {
if [ -f /var/lock/subsys/powersave ]; then
- msg_stopping powersave
- killproc powersaved
- rm -f /var/lock/subsys/powersave >/dev/null 2>&1
+ msg_reloading "Powersaved"
+ killproc powersaved -HUP
+ RETVAL=$?
else
- msg_not_running powersave
+ msg_not_running "Powersaved"
+ exit 7
fi
}
+condrestart() {
+ if [ ! -f /var/lock/subsys/powersave ]; then
+ msg_not_running "Powersaved"
+ RETVAL=$1
+ return
+ fi
+
+ checkconfig
+ stop
+ start
+}
+
RETVAL=0
# See how we were called.
case "$1" in
@@ -68,26 +92,22 @@
stop)
stop
;;
- reload|force-reload)
- if [ -f /var/lock/subsys/powersave ]; then
- msg_reloading powersave
- killproc powersaved -HUP
- RETVAL=$?
- else
- msg_not_running powersave
- exit 7
- fi
- ;;
restart)
stop
start
;;
+ try-restart)
+ condrestart 0
+ ;;
+ reload|force-reload)
+ reload
+ ;;
status)
status powersaved
exit $?
;;
*)
- msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+ msg_usage "$0
{start|stop|restart|try-restart|reload|force-reload|status}"
exit 3
esac
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/powersave/powersave.init?r1=1.13&r2=1.14&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
