Author: titmuss
Date: Mon Jan 5 03:13:12 2009
New Revision: 3668
URL: http://svn.slimdevices.com?rev=3668&root=Jive&view=rev
Log:
Bug: N/A
Description:
Add /etc/init.d/squeezeplay script to make it easier to restart the squeezeplay
application. Options are:
- start : to start SqueezePlay
- stop : to kill SqueezePlay
- stopwdog : to kill SqueezePlay, and start a watchdog process
- restart : to restart SqueezePlay
Added:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/squeezeplay
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/rcS
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
Modified: 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/rcS
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/rcS?rev=3668&root=Jive&r1=3667&r2=3668&view=diff
==============================================================================
--- 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/rcS
(original)
+++ 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/rcS Mon
Jan 5 03:13:12 2009
@@ -95,15 +95,5 @@
done
-echo "Starting jive applications"
-export SDL_NOMOUSE=1
-export ALSA_CONFIG_PATH=/usr/share/alsa/alsa.conf
-export SQUEEZEPLAY_HOME=/etc/squeezeplay
-for dir in /media/*/squeezeplay; do
- if [ -d $dir ]; then
- LUA_PATH="$LUA_PATH;$dir/?.lua"
- fi
-done
-export LUA_PATH
-
-(cd /usr/bin; /usr/bin/jive &)
+# Start squeezeplay
+/etc/init.d/squeezeplay start
Added:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/squeezeplay
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/squeezeplay?rev=3668&root=Jive&view=auto
==============================================================================
---
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/squeezeplay
(added)
+++
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/squeezeplay
Mon Jan 5 03:13:12 2009
@@ -1,0 +1,48 @@
+#!/bin/sh
+
+case "$1" in
+ start)
+ echo "Starting SqueezePlay"
+
+ export SDL_NOMOUSE=1
+ export ALSA_CONFIG_PATH=/usr/share/alsa/alsa.conf
+ export SQUEEZEPLAY_HOME=/etc/squeezeplay
+
+ # Add extensions on media eg SD card to lua path
+ for dir in /media/*/squeezeplay; do
+ if [ -d $dir ]; then
+ LUA_PATH="$LUA_PATH;$dir/?.lua"
+ fi
+ done
+ export LUA_PATH
+
+ cd /usr/bin
+ /usr/bin/jive &
+ ;;
+
+ stop)
+ echo "Stopping SqueezePlay"
+
+ killall -q jive
+ ;;
+
+ stopwdog)
+ echo "Stopping SqueezePlay (keeping watchdog alive)"
+
+ killall -q jive
+ sleep 2
+ watchdog -t 2 /dev/watchdog
+ ;;
+
+ restart)
+ $0 stop
+ sleep 2
+ $0 start
+ ;;
+
+ *)
+ echo "Usage: $0 {start|stop|stopwdog|restart}"
+ exit 1
+esac
+
+exit 0
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb?rev=3668&root=Jive&r1=3667&r2=3668&view=diff
==============================================================================
---
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
(original)
+++
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
Mon Jan 5 03:13:12 2009
@@ -3,7 +3,7 @@
PRIORITY = "required"
LICENSE = "GPL"
-PR = "r22"
+PR = "r23"
SRC_URI = " \
file://85-mtd.rules \
@@ -30,6 +30,7 @@
file://rcS.local.example \
file://services \
file://shadow \
+ file://squeezeplay \
file://suspend \
file://udhcpc_action \
file://wlan \
@@ -73,6 +74,7 @@
install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/inetd.conf
install -m 0644 ${WORKDIR}/inittab ${D}${sysconfdir}/inittab
install -m 0755 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS
+ install -m 0755 ${WORKDIR}/squeezeplay
${D}${sysconfdir}/init.d/squeezeplay
install -m 0755 ${WORKDIR}/wlan ${D}${sysconfdir}/init.d/wlan
install -m 0755 ${WORKDIR}/suspend ${D}${sysconfdir}/init.d/suspend
install -m 0644 ${WORKDIR}/issue ${D}${sysconfdir}/issue
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
