diff options
Diffstat (limited to 'abs/core/runit-scripts')
11 files changed, 66 insertions, 37 deletions
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index de02476..4fd9efd 100755 --- a/abs/core/runit-scripts/PKGBUILD +++ b/abs/core/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts -pkgver=8.3 -pkgrel=6 +pkgver=8.4 +pkgrel=2 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/core/runit-scripts/runitscripts/services/frontend/finish b/abs/core/runit-scripts/runitscripts/services/frontend/finish index d96bcf0..6bc324d 100755 --- a/abs/core/runit-scripts/runitscripts/services/frontend/finish +++ b/abs/core/runit-scripts/runitscripts/services/frontend/finish @@ -11,7 +11,8 @@ function cleanup(){ #continue plymouthd that was stopped in /etc/X11/Sessions/Linhes pidfile=/run/plymouth.pid -if [ -e "$pidfile" ]; then +if [ -e "$pidfile" ]; +then plypid=`cat "$pidfile"` if [ -n "$plypid" ]; then kill -s CONT "$plypid" @@ -20,34 +21,46 @@ fi grep -q nox /proc/cmdline STATUS=$? - if [ $STATUS = 0 ] - then - printhl " status = 0" - chvt 2 +if [ $STATUS = 0 ] +then + printhl " status = 0: no X" + chvt 2 else - pkill -f "X :0" - printhl " status = 1" + x1pid=`pidof Xorg` + pkill -f "Xorg" + printhl " status = 1: X" if [ ! -d /etc/sv/frontend/.runtime ] then - mkdir -p /etc/sv/frontend/.runtime + mkdir -p /etc/sv/frontend/.runtime fi touch /etc/sv/frontend/.runtime/`date +%s` - sleep 0.2 - ps -U mythtv -ef |grep "/bin/sh /usr/bin/startx"|grep -v grep|awk ' { print $2 } '|xargs kill -9 2> /dev/null - cdate=`date` + sleep 1 + #ps -U mythtv -ef |grep "xinit /etc/X11/Sessions/LinHES"|grep -v grep|awk ' { print $2 } '|xargs kill -9 2> /dev/null + #cdate=`date` numfilestotal=`/usr/bin/file_time_offset.py -s0 -d/etc/sv/frontend/.runtime` numfilesover10secondsold=`/usr/bin/file_time_offset.py -s10 -d/etc/sv/frontend/.runtime` numfileslessthan10secondsold=$(($numfilestotal-$numfilesover10secondsold)) if [ $numfileslessthan10secondsold -gt 2 ] then - sv stop frontend - printhl " Frontend disabled, due to many restarts." - printhl " Run \"sv start frontend\" to try again" - cleanup + sv stop frontend + printhl " Frontend disabled, due to many restarts." + printhl " Run \"sv start frontend\" to try again" + cleanup else - if [ $numfilestotal -gt 10 ] - then - cleanup - fi + if [ $numfilestotal -gt 10 ] + then + cleanup + fi fi + if [[ `pidof "Xorg"` -eq $x1pid ]] + then + printhl " X $x1pid is shutting down, waiting 10 seconds" + sleep 10 + if [[ `pidof "Xorg"` -eq $x1pid ]] + then + printhl " killing X $x1pid" + kill -9 $x1pid + fi + fi + killall -9 mythfrontend fi diff --git a/abs/core/runit-scripts/runitscripts/services/frontend/run b/abs/core/runit-scripts/runitscripts/services/frontend/run index 22b65db..7a80665 100755 --- a/abs/core/runit-scripts/runitscripts/services/frontend/run +++ b/abs/core/runit-scripts/runitscripts/services/frontend/run @@ -21,5 +21,5 @@ stat_runit "Starting LinHES frontend" # fi #echo "Starting LinHES frontend" >/dev/tty1 -#exec /bin/su - mythtv -l -c /usr/LH/bin/LinHES-start -exec sudo -u mythtv -i /usr/LH/bin/LinHES-start +exec su - mythtv -l -c /usr/LH/bin/LinHES-start +#exec sudo -u mythtv -i /usr/LH/bin/LinHES-start diff --git a/abs/core/runit-scripts/runitscripts/services/msg_daemon/run b/abs/core/runit-scripts/runitscripts/services/msg_daemon/run index 6f1b4b7..e998a08 100755 --- a/abs/core/runit-scripts/runitscripts/services/msg_daemon/run +++ b/abs/core/runit-scripts/runitscripts/services/msg_daemon/run @@ -5,5 +5,5 @@ export TERM=linux . /etc/rc.d/functions . /etc/profile stat_runit "Starting osd message daemon" -exec env DISPLAY=127.0.0.1:0 /usr/LH/bin/msg_daemon.py +exec env DISPLAY=:0.0 /usr/LH/bin/msg_daemon.py diff --git a/abs/core/runit-scripts/runitscripts/services/mythbackend/run b/abs/core/runit-scripts/runitscripts/services/mythbackend/run index d97cf21..6e42c12 100755 --- a/abs/core/runit-scripts/runitscripts/services/mythbackend/run +++ b/abs/core/runit-scripts/runitscripts/services/mythbackend/run @@ -79,5 +79,6 @@ export HOME=/root stat_runit "Starting Primary MythBackend" fi - exec sudo -u mythtv /usr/bin/mythbackend -q --syslog local6 -# fi + #exec sudo -u mythtv /usr/bin/mythbackend -q --syslog local6 + exec su mythtv -c "/usr/bin/mythbackend -q --syslog local6" +# fi diff --git a/abs/core/runit-scripts/runitscripts/services/plexmediaserver/run b/abs/core/runit-scripts/runitscripts/services/plexmediaserver/run new file mode 100755 index 0000000..6d0b04e --- /dev/null +++ b/abs/core/runit-scripts/runitscripts/services/plexmediaserver/run @@ -0,0 +1,20 @@ +#!/bin/sh +exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/plexmediaserver +. /etc/locale.conf + +stat_runit "Starting Plex Media Server" +export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" +export PLEX_MEDIA_SERVER_HOME="${PLEX_MEDIA_SERVER_HOME}" +export PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}" +export PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS="${PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS}" +export PLEX_MEDIA_SERVER_TMPDIR="${PLEX_MEDIA_SERVER_TMPDIR}" +export TMPDIR="${TMPDIR}" +export LC_ALL="${LANG}" +export LANG="${LANG}" +ulimit -s 3000 + +exec chpst -uplex:plex /opt/plexmediaserver/Plex\ Media\ Server diff --git a/abs/core/runit-scripts/runitscripts/services/rsyslog/run b/abs/core/runit-scripts/runitscripts/services/rsyslog/run index f356d10..2fd4f17 100755 --- a/abs/core/runit-scripts/runitscripts/services/rsyslog/run +++ b/abs/core/runit-scripts/runitscripts/services/rsyslog/run @@ -6,5 +6,4 @@ export TERM=linux stat_runit "Starting rsyslog" -exec /usr/bin/rsyslogd -n -c5 - +exec /usr/bin/rsyslogd -n diff --git a/abs/core/runit-scripts/runitscripts/services/supplemental-slave/run b/abs/core/runit-scripts/runitscripts/services/supplemental-slave/run index 5be390d..7c15210 100755 --- a/abs/core/runit-scripts/runitscripts/services/supplemental-slave/run +++ b/abs/core/runit-scripts/runitscripts/services/supplemental-slave/run @@ -8,4 +8,4 @@ MYTH_RUN_STATUS="1" . /etc/profile stat_runit "Starting supplemental web client" cd /data/srv/httpd/cgi -exec sudo -u http "./slaveserve.py" 2>/var/log/supplemental-slave.log +exec chpst -u http "./slaveserve.py" 2>/var/log/supplemental-slave.log diff --git a/abs/core/runit-scripts/runitscripts/services/vnc/run b/abs/core/runit-scripts/runitscripts/services/vnc/run index bc411b1..b67d174 100755 --- a/abs/core/runit-scripts/runitscripts/services/vnc/run +++ b/abs/core/runit-scripts/runitscripts/services/vnc/run @@ -11,5 +11,5 @@ geometry=1024x768 #. /etc/conf.d/vncserver 2>/dev/null cp -f $MV_ROOT/templates/vnc.service /etc/avahi/services/vnc.service 2>/dev/null cd ~vncsvc -#exec su vncsvc -c "/usr/bin/vncserver -fg -geometry $geometry :1" 2>/var/log/vnc.log -exec sudo -u vncsvc -i /usr/bin/vncserver -fg -geometry $geometry :1 2>/var/log/vnc.log +exec su vncsvc -c "/usr/bin/vncserver -fg -geometry $geometry :1" 2>/var/log/vnc.log +#exec sudo -u vncsvc -i /usr/bin/vncserver -fg -geometry $geometry :1 2>/var/log/vnc.log diff --git a/abs/core/runit-scripts/runitscripts/services/xymon-client/run b/abs/core/runit-scripts/runitscripts/services/xymon-client/run index fcd5093..c18bf18 100644 --- a/abs/core/runit-scripts/runitscripts/services/xymon-client/run +++ b/abs/core/runit-scripts/runitscripts/services/xymon-client/run @@ -53,8 +53,4 @@ MACHINE="`echo $MACHINEDOTS | sed -e 's/\./,/g'`" export MACHINE -sudo -u nobody MACHINE=$MACHINE XYMONCLIENTHOME=$XYMONCLIENTHOME $XYMONCLIENTHOME/bin/xymonlaunch --config=$XYMONCLIENTHOME/etc/clientlaunch.cfg --log=$XYMONCLIENTHOME/logs/clientlaunch.log --pidfile=$XYMONCLIENTHOME/logs/clientlaunch.$MACHINEDOTS.pid --no-daemon - - - - +exec chpst -u nobody $XYMONCLIENTHOME/bin/xymonlaunch --config=$XYMONCLIENTHOME/etc/clientlaunch.cfg --log=$XYMONCLIENTHOME/logs/clientlaunch.log --pidfile=$XYMONCLIENTHOME/logs/clientlaunch.$MACHINEDOTS.pid --no-daemon diff --git a/abs/core/runit-scripts/runitscripts/services/xymon-server/run b/abs/core/runit-scripts/runitscripts/services/xymon-server/run index 6198543..c2053b1 100644 --- a/abs/core/runit-scripts/runitscripts/services/xymon-server/run +++ b/abs/core/runit-scripts/runitscripts/services/xymon-server/run @@ -6,4 +6,4 @@ export TERM=linux stat_runit "Starting xymon server" -exec sudo -u nobody /home/xymon/server/bin/xymonlaunch --config=/home/xymon/server/etc/tasks.cfg --env=/home/xymon/server/etc/xymonserver.cfg --log=/var/log/hobbit/xymonlaunch.log --pidfile=/var/log/hobbit/xymonlaunch.pid --no-daemon +exec chpst -u nobody /home/xymon/server/bin/xymonlaunch --config=/home/xymon/server/etc/tasks.cfg --env=/home/xymon/server/etc/xymonserver.cfg --log=/var/log/hobbit/xymonlaunch.log --pidfile=/var/log/hobbit/xymonlaunch.pid --no-daemon |