Merge branch 'cc-2015-on-reboot-resume-show' into devel

Conflicts:
	python_apps/media-monitor/airtime-media-monitor-init-d
This commit is contained in:
martin 2011-06-17 15:10:33 -04:00
commit 2e4519f156
32 changed files with 401 additions and 389 deletions

View file

@ -11,17 +11,19 @@
USERID=root
GROUPID=www-data
NAME=Airtime
NAME=Airtime\ Media\ Monitor
DAEMON=/usr/bin/airtime-media-monitor
DAEMON=/usr/lib/airtime/media-monitor/airtime-media-monitor
PIDFILE=/var/run/airtime-media-monitor.pid
start () {
monit monitor airtime-media-monitor
start-stop-daemon --start --background --quiet --chuid $USERID:$GROUPID --make-pidfile --pidfile $PIDFILE --startas $DAEMON
}
stop () {
# Send TERM after 5 seconds, wait at most 30 seconds.
monit unmonitor airtime-media-monitor
start-stop-daemon --stop --oknodo --retry TERM/5/0/30 --quiet --pidfile $PIDFILE
rm -f $PIDFILE
}