summaryrefslogtreecommitdiffstats
path: root/abs/core
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2012-01-26 02:18:38 (GMT)
committerJames Meyer <james.meyer@operamail.com>2012-01-26 02:18:38 (GMT)
commit55b3626309830e1301dcd66e5755a8ab2b59a4a1 (patch)
treeebb27ad59d560300c00a3a913066cba378410040 /abs/core
parent7c3ce938ec4888b5a3f2736adc6b0a55808c6012 (diff)
downloadlinhes_pkgbuild-55b3626309830e1301dcd66e5755a8ab2b59a4a1.zip
linhes_pkgbuild-55b3626309830e1301dcd66e5755a8ab2b59a4a1.tar.gz
linhes_pkgbuild-55b3626309830e1301dcd66e5755a8ab2b59a4a1.tar.bz2
runit-scripts: add mythdroid (reverse-merged from commit 776f600da45e3bd07de34509624b88d6081cd4da)
runit-scripts: add mythdroid (reverse-merged from commit 9e3312aa14c7e94b95c6cceba4ae8a0610e272c7) Reverting the entire change because it introduces problems with mythbackend. Will add the mythdroid fix back in the next few commits.
Diffstat (limited to 'abs/core')
-rwxr-xr-xabs/core/runit-scripts/PKGBUILD2
-rwxr-xr-xabs/core/runit-scripts/runitscripts/services/mythbackend/log/run8
-rwxr-xr-xabs/core/runit-scripts/runitscripts/services/mythbackend/run22
-rwxr-xr-xabs/core/runit-scripts/runitscripts/services/mythdroid/finish9
-rwxr-xr-xabs/core/runit-scripts/runitscripts/services/mythdroid/run16
5 files changed, 18 insertions, 39 deletions
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index b58966d..877fe18 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=50
+pkgrel=49
pkgdesc="collection of startup scripts for runit"
url="http://smarden.org/runit/"
license="BSD"
diff --git a/abs/core/runit-scripts/runitscripts/services/mythbackend/log/run b/abs/core/runit-scripts/runitscripts/services/mythbackend/log/run
deleted file mode 100755
index 17692a7..0000000
--- a/abs/core/runit-scripts/runitscripts/services/mythbackend/log/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-exec 2>&1
-#export TERM=linux
-#. /etc/rc.conf
-#. /etc/rc.d/functions
-#stat_runit "Starting MythBackend logger"
-/usr/bin/logger -p local7.info -t mythbackend
-
diff --git a/abs/core/runit-scripts/runitscripts/services/mythbackend/run b/abs/core/runit-scripts/runitscripts/services/mythbackend/run
index 4bf54fb..e3ef721 100755
--- a/abs/core/runit-scripts/runitscripts/services/mythbackend/run
+++ b/abs/core/runit-scripts/runitscripts/services/mythbackend/run
@@ -1,21 +1,33 @@
#!/bin/sh
exec 2>&1
-. /etc/profile
+#. /etc/profile
. /etc/systemconfig
export TERM=linux
. /etc/rc.conf
. /etc/rc.d/functions
+
+
+stat_runit "Scanning for new storage"
+MYTHCONFDIR=/usr/share/mythtv /usr/LH/bin/add_storage.py --report > /dev/null
+if [ -e /tmp/scan_report ]
+then
+ echo "#####################################################"
+ echo " New storage found "
+ echo ""
+ cat /tmp/scan_report
+ echo ""
+ echo " run /usr/LH/bin/add_storage.py to make it available "
+ echo "#######################################################"
+
+fi
+
stat_runit "Starting MythBackend"
export HOME=/root
if [ ! x$SystemType = xSlave_backend ]
then
sv start mysql > /dev/null 2>/dev/null
- #run mythfilldatabase
- #printhl " Running mythfilldatabase"
- #/usr/MythVantage/bin/initial_db_run &
fi
-mkfifo /tmp/mbefifo >/dev/null 2>/dev/null
#echo "Starting mythbackend"
# if [ -f /tmp/debug ]
# then
diff --git a/abs/core/runit-scripts/runitscripts/services/mythdroid/finish b/abs/core/runit-scripts/runitscripts/services/mythdroid/finish
deleted file mode 100755
index c3d8b6b..0000000
--- a/abs/core/runit-scripts/runitscripts/services/mythdroid/finish
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f /etc/conf.d/mdd.conf ] && . /etc/conf.d/mdd.conf
-
- PID=$(pidof -o %PPID -x /usr/bin/vendor_perl/mdd.pl)
- [[ -n $PID ]] && kill $PID &> /dev/null
diff --git a/abs/core/runit-scripts/runitscripts/services/mythdroid/run b/abs/core/runit-scripts/runitscripts/services/mythdroid/run
deleted file mode 100755
index fa2cb48..0000000
--- a/abs/core/runit-scripts/runitscripts/services/mythdroid/run
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f /etc/conf.d/mdd.conf ] && . /etc/conf.d/mdd.conf
-
- stat_runit "Starting MythDroid daemon"
-
- /sbin/chpst -u mythtv /usr/bin/vendor_perl/mdd.pl
- PID=$(pidof -o %PPID -x /usr/bin/vendor_perl/mdd.pl)
-
-# Wait until daemon dies, else runit can't supervise us
- while [ "`pidof -o %PPID -x /usr/bin/vendor_perl/mdd.pl`" == "$PID" ]; do
- sleep 2
- done