Merge branch 'testing'HEADmaster

9 files changed, 19 insertions, 17 deletions

diff --git a/abs/core/runit-scripts/runitscripts/services/alsa-utils/run b/abs/core/runit-scripts/runitscripts/services/alsa-utils/run
index a376059..a15a911 100755
--- a/abs/core/runit-scripts/runitscripts/services/alsa-utils/run
+++ b/abs/core/runit-scripts/runitscripts/services/alsa-utils/run
@@ -1,4 +1,5 @@
 #!/bin/sh
+MYTH_RUN_STATUS="1"
 set -e
 /usr/bin/alsactl restore
 exec chpst -b alsa pause
diff --git a/abs/core/runit-scripts/runitscripts/services/apcupsd/run b/abs/core/runit-scripts/runitscripts/services/apcupsd/run
index 70bd9e0..7d9034e 100755
--- a/abs/core/runit-scripts/runitscripts/services/apcupsd/run
+++ b/abs/core/runit-scripts/runitscripts/services/apcupsd/run
@@ -1,6 +1,6 @@
 #!/bin/sh
 exec 2>&1
-
+MYTH_RUN_STATUS="1"
 . /etc/rc.conf
 . /etc/rc.d/functions
 
diff --git a/abs/core/runit-scripts/runitscripts/services/autofs/run b/abs/core/runit-scripts/runitscripts/services/autofs/run
index c0800a2..941d59c 100755
--- a/abs/core/runit-scripts/runitscripts/services/autofs/run
+++ b/abs/core/runit-scripts/runitscripts/services/autofs/run
@@ -1,6 +1,6 @@
 #!/bin/sh
 exec 2>&1
-
+MYTH_RUN_STATUS="1"
 . /etc/rc.conf
 . /etc/rc.d/functions
 
diff --git a/abs/core/runit-scripts/runitscripts/services/certmaster/run b/abs/core/runit-scripts/runitscripts/services/certmaster/run
index 0f5add7..f3ac054 100644
--- a/abs/core/runit-scripts/runitscripts/services/certmaster/run
+++ b/abs/core/runit-scripts/runitscripts/services/certmaster/run
@@ -1,4 +1,5 @@
 #!/bin/bash
+MYTH_RUN_STATUS="1"
 if [ ! -e /etc/pki/certmaster/ca/certmaster.key ]
 then
     /usr/bin/certmaster daemon
diff --git a/abs/core/runit-scripts/runitscripts/services/irexec/run b/abs/core/runit-scripts/runitscripts/services/irexec/run
index 01b775a..bd6f418 100644
--- a/abs/core/runit-scripts/runitscripts/services/irexec/run
+++ b/abs/core/runit-scripts/runitscripts/services/irexec/run
@@ -1,7 +1,7 @@
 #!/bin/sh
 exec 2>&1
 export TERM=linux
-
+MYTH_RUN_STATUS="1"
 . /etc/rc.conf
 . /etc/rc.d/functions
 . /etc/profile
diff --git a/abs/core/runit-scripts/runitscripts/services/mysql/run b/abs/core/runit-scripts/runitscripts/services/mysql/run
index 8fad493..51dc27f 100755
--- a/abs/core/runit-scripts/runitscripts/services/mysql/run
+++ b/abs/core/runit-scripts/runitscripts/services/mysql/run
@@ -1,6 +1,7 @@
 #!/bin/bash
 exec 2>&1
 export TERM=linux
+MYTH_RUN_STATUS="1"
 . /etc/rc.conf
 . /etc/rc.d/functions
 stat_runit "Starting Mysql"
diff --git a/abs/core/runit-scripts/runitscripts/services/plexmediaserver/run b/abs/core/runit-scripts/runitscripts/services/plexmediaserver/run
index 6d0b04e..a6e521a 100755
--- a/abs/core/runit-scripts/runitscripts/services/plexmediaserver/run
+++ b/abs/core/runit-scripts/runitscripts/services/plexmediaserver/run
@@ -1,6 +1,7 @@
 #!/bin/sh
 exec 2>&1
 export TERM=linux
+MYTH_RUN_STATUS="1"
 . /etc/rc.conf
 . /etc/rc.d/functions
 . /etc/conf.d/plexmediaserver
@@ -17,4 +18,4 @@ export LC_ALL="${LANG}"
 export LANG="${LANG}"
 ulimit -s 3000
 
-exec chpst -uplex:plex /opt/plexmediaserver/Plex\ Media\ Server
+exec chpst -uplex:plex /usr/lib/plexmediaserver/Plex\ Media\ Server
diff --git a/abs/core/runit-scripts/runitscripts/services/remotes/run b/abs/core/runit-scripts/runitscripts/services/remotes/run
index 9fbb16e..9c61daa 100755
--- a/abs/core/runit-scripts/runitscripts/services/remotes/run
+++ b/abs/core/runit-scripts/runitscripts/services/remotes/run
@@ -8,7 +8,7 @@ export TERM=linux
 LOG=/tmp/remotes.log
 
 MODPROBE="/usr/bin/modprobe"
-LIRCD="/usr/bin/lircd "
+LIRCD="/usr/bin/lircd"
 
 SETSERIAL="/usr/bin/setserial"
 
@@ -112,7 +112,7 @@ else
 
     if [ x$HostBlasterType = xCommandIR -o x$ReceiverType = xCommandIR ]
     then
-        CMD="$LIRCD-r -n  --driver=commandir"
+        CMD="$LIRCD --release --nodaemon --driver=commandir"
         printhl "   Using commandir"
         echo $CMD >>$LOG
         $CMD >>$LOG 2>>$LOG
@@ -120,7 +120,7 @@ else
     elif [ x$HostBlasterType = xiguanaIR-usb -o x$ReceiverType = xiguanaIR-usb ]
     then
         sv start igdaemon
-        CMD="$LIRCD-r -n  --driver=iguanaIR"
+        CMD="$LIRCD --release --nodaemon --driver=iguanaIR"
         printhl "       Using iguanaIR usb"
         echo $CMD >>$LOG
         $CMD >>$LOG 2>>$LOG
@@ -128,7 +128,7 @@ else
     elif [ x$ReceiverType = "xSiliconDust_HDHR" ]
     then
         # if using the SiliconDust_HDHR as an I/R Receiver
-        CMD="$LIRCD-H udp -d 5000 -n"
+        CMD="$LIRCD --nodaemon --driver=udp --device=5000"
         printhl "   Using SiliconDust on port 5000"
         echo $CMD >>$LOG
         $CMD >>$LOG 2>>$LOG
@@ -177,7 +177,7 @@ else
                     DEFINED_RECEIVER="False"
                     for i in `seq 1 $num_lirc`
                     do
-                        CMD="$LIRCD-r -d /dev/lirc$i --output=/var/run/lirc/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i"
+                        CMD="$LIRCD --release --device=/dev/lirc$i --driver=default --output=/var/run/lirc/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i"
                         printhl "   Device $i"
                         echo $CMD >>$LOG
                         $CMD >>$LOG 2>>$LOG
@@ -216,24 +216,24 @@ else
             then
                 #start receiver
                 #start blaster  chain
-                CMD="$LIRCD-r -d $IRNODE --output=/var/run/lirc/lircd1 --pidfile=/var/run/lircd1.pid --listen=8761"
-                LCMD="$LIRCD-r -n -d $BLASTERNODE --output /var/run/lirc/lircd  $LASTCMD"
+                CMD="$LIRCD --release --device=$IRNODE --driver=default --output=/var/run/lirc/lircd1 --pidfile=/var/run/lircd1.pid --listen=8761"
+                LCMD="$LIRCD --release --nodaemon --device=$BLASTERNODE --driver=default --output=/var/run/lirc/lircd  $LASTCMD"
                 echo $CMD >>$LOG
                 $CMD >>$LOG 2>>$LOG
 
             elif [ x$USE_BLASTER = xTrue ]
             then
                 #start only the blaster
-                LCMD="$LIRCD-r -n -d $BLASTERNODE --output /var/run/lirc/lircd  $LASTCMD"
+                LCMD="$LIRCD --release --nodaemon --device=$BLASTERNODE --driver=default --output=/var/run/lirc/lircd  $LASTCMD"
 
             elif [ x$DEFINED_RECEIVER = xTrue ]
             then
                 #start reciever
-                LCMD="$LIRCD-r -n -d $IRNODE --output /var/run/lirc/lircd"
+                LCMD="$LIRCD --release --nodaemon --device=$IRNODE --driver=default --output=/var/run/lirc/lircd"
 
             else
                 #default case of /dev/lirc0
-                LCMD="$LIRCD-r -n -d /dev/lirc0 --output /var/run/lirc/lircd  $LASTCMD"
+                LCMD="$LIRCD --release --nodaemon --device=/dev/lirc0 --driver=default --output=/var/run/lirc/lircd  $LASTCMD"
             fi
 
             echo $LASTCMD >>$LOG
@@ -242,10 +242,8 @@ else
             
             
             
-            
             echo "Starting remotes from $LCMD" >>$LOG
             exec $LCMD >>$LOG 2>>$LOG
-
         fi
     fi
 fi
diff --git a/abs/core/runit-scripts/runitscripts/services/rpcbind/run b/abs/core/runit-scripts/runitscripts/services/rpcbind/run
index 86a961b..9853b88 100755
--- a/abs/core/runit-scripts/runitscripts/services/rpcbind/run
+++ b/abs/core/runit-scripts/runitscripts/services/rpcbind/run
@@ -4,4 +4,4 @@ export TERM=linux
 . /etc/rc.conf
 . /etc/rc.d/functions
 stat_runit "Starting rpc.bind"
-exec /usr/bin/rpcbind -d
+exec /usr/bin/rpcbind -d -f