diff options
Diffstat (limited to 'abs/core/runit-scripts')
9 files changed, 43 insertions, 6 deletions
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index 9e6396e..dac1d6d 100755 --- a/abs/core/runit-scripts/PKGBUILD +++ b/abs/core/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=2.1.1 -pkgrel=67 +pkgrel=72 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" @@ -11,7 +11,7 @@ replaces=() backup=('etc/runit/1.local' 'etc/runit/3.local') install=runit.install source=(fbsplash-runit.sh) -arch=('i686') +arch=('i686' 'x86_64') build() { rsync -a --exclude=.svn --exclude=*~ $startdir/runitscripts $startdir/src diff --git a/abs/core/runit-scripts/runitscripts/1 b/abs/core/runit-scripts/runitscripts/1 index a45fc16..0f1b8a9 100755 --- a/abs/core/runit-scripts/runitscripts/1 +++ b/abs/core/runit-scripts/runitscripts/1 @@ -5,7 +5,10 @@ hostname `cat /etc/hostname` /sbin/sysctl -p 2>/dev/null >/dev/null #make sure permissions are right for /etc/systemconfig -/usr/bin/setfacl -m u:mythtv:rw- /etc/systemconfig > /dev/null +chown root:mythtv /etc/systemconfig +chmod 774 /etc/systemconfig +/usr/bin/setfacl -m u:mythtv:rw- /etc/systemconfig 2>/dev/null >/dev/null + #yes it's needed the 2nd time /usr/LH/bin/load-modules-mythvantage.sh >/dev/null rm /etc/dhcpc/dhcpcd*.pid 2>/dev/null diff --git a/abs/core/runit-scripts/runitscripts/services/dbus/run b/abs/core/runit-scripts/runitscripts/services/dbus/run index a9af150..af6ebbb 100755 --- a/abs/core/runit-scripts/runitscripts/services/dbus/run +++ b/abs/core/runit-scripts/runitscripts/services/dbus/run @@ -4,6 +4,10 @@ export TERM=linux . /etc/rc.conf . /etc/rc.d/functions stat_runit "Starting dbus" +if [[ ! -d /run/dbus ]] +then + install -m755 -g 81 -o 81 -d /run/dbus +fi exec /usr/bin/dbus-daemon --system --nofork 2>/dev/null >/dev/null diff --git a/abs/core/runit-scripts/runitscripts/services/frontend/log/run b/abs/core/runit-scripts/runitscripts/services/frontend/log/run index 463045f..801eaf2 100755 --- a/abs/core/runit-scripts/runitscripts/services/frontend/log/run +++ b/abs/core/runit-scripts/runitscripts/services/frontend/log/run @@ -1,5 +1,5 @@ #!/bin/sh exec 2>&1 . /etc/systemconfig - /usr/bin/logger -p local6.info -t mythfrontend + /usr/bin/logger -p local6.info -t frontend diff --git a/abs/core/runit-scripts/runitscripts/services/msg_daemon/run b/abs/core/runit-scripts/runitscripts/services/msg_daemon/run new file mode 100755 index 0000000..b544550 --- /dev/null +++ b/abs/core/runit-scripts/runitscripts/services/msg_daemon/run @@ -0,0 +1,7 @@ +#!/bin/sh +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/profile +stat_runit "Starting osd message daemon" +exec /usr/LH/bin/msg_daemon.py diff --git a/abs/core/runit-scripts/runitscripts/services/vnc/finish b/abs/core/runit-scripts/runitscripts/services/vnc/finish new file mode 100755 index 0000000..243488c --- /dev/null +++ b/abs/core/runit-scripts/runitscripts/services/vnc/finish @@ -0,0 +1,9 @@ +#!/bin/sh +#set -x +exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Stopping vnc service" +rm -f /etc/avahi/services/vnc.service 2>/dev/null +su vncsvc -c "vncserver -kill :1" diff --git a/abs/core/runit-scripts/runitscripts/services/vnc/run b/abs/core/runit-scripts/runitscripts/services/vnc/run new file mode 100755 index 0000000..af53139 --- /dev/null +++ b/abs/core/runit-scripts/runitscripts/services/vnc/run @@ -0,0 +1,14 @@ +#!/bin/sh +#set -x +exec 2>&1 +export TERM=linux +MYTH_RUN_STATUS="1" +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/profile +stat_runit "Starting vnc service" +geometry=1024x768 +#. /etc/conf.d/vncserver 2>/dev/null +cp -f $MV_ROOT/templates/vnc.service /etc/avahi/services/vnc.service 2>/dev/null +exec su vncsvc -c "/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 a454c6b..fcd5093 100644 --- a/abs/core/runit-scripts/runitscripts/services/xymon-client/run +++ b/abs/core/runit-scripts/runitscripts/services/xymon-client/run @@ -46,7 +46,7 @@ do done XYMONCLIENTHOME="`dirname $0`" -XYMONCLIENTHOME="/data/srv/xymon/client" +XYMONCLIENTHOME="/home/xymon/client" export MACHINEDOTS SERVEROSTYPE XYMONOSSCRIPT XYMONCLIENTHOME CONFIGCLASS MACHINE="`echo $MACHINEDOTS | sed -e 's/\./,/g'`" diff --git a/abs/core/runit-scripts/runitscripts/services/xymon-server/run b/abs/core/runit-scripts/runitscripts/services/xymon-server/run index b850c0a..6198543 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 /data/srv/xymon/server/bin/xymonlaunch --config=/data/srv/xymon/server/etc/tasks.cfg --env=/data/srv/xymon/server/etc/xymonserver.cfg --log=/var/log/hobbit/xymonlaunch.log --pidfile=/var/log/hobbit/xymonlaunch.pid --no-daemon +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 |