Merge branch 'testing'

48 files changed, 163 insertions, 123 deletions

diff --git a/abs/core/runit-scripts/runitscripts/1 b/abs/core/runit-scripts/runitscripts/1
index 9463e60..9f92530 100755
--- a/abs/core/runit-scripts/runitscripts/1
+++ b/abs/core/runit-scripts/runitscripts/1
@@ -1,28 +1,33 @@
 #!/bin/bash
+
+PATH=/bin:/sbin:/usr/bin:/usr/sbin
+
 /etc/rc.sysinit
 . /etc/rc.conf
 . /etc/rc.d/functions
-#no longer needed rc.sysinit takes care of the hostname
-#hostname `cat /etc/hostname`
-/sbin/sysctl -p 2>/dev/null >/dev/null
+
+sysctl -p 2>/dev/null >/dev/null
+
 #make sure permissions are right for /etc/systemconfig
 chown root:mythtv /etc/systemconfig
 chmod 774 /etc/systemconfig
-/usr/bin/setfacl -m u:mythtv:rw- /etc/systemconfig 2>/dev/null >/dev/null
+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
 rm -f /service/frontend/.runtime/* 2>/dev/null
 rm -f /etc/runit/reboot 2>/dev/null
-/sbin/agetty -8 38400 tty10 linux &
+agetty -8 38400 tty10 linux &
+
 stat_busy "Starting network"
-/bin/mkdir -p /var/lock/subsys
+mkdir -p /var/lock/subsys
 /etc/net/scripts/network.init start 2>/var/log/network.init.error >/var/log/network.init
 stat_done
-/usr/sbin/ethtool -s  eth0 wol g 2>/dev/null
-/usr/sbin/ethtool -s  eth1 wol g 2>/dev/null
-/usr/sbin/ethtool -s  eth2 wol g 2>/dev/null
+
+ethtool -s  eth0 wol g 2>/dev/null
+ethtool -s  eth1 wol g 2>/dev/null
+ethtool -s  eth2 wol g 2>/dev/null
+
 #cleanup of log files
 if [ -f /etc/cron.daily/log_care ]
 then
@@ -39,13 +44,15 @@ then
     /etc/runit/1.local
     stat_done
 fi
+
 #some stuff from rc.multi
 run_hook multi_start
+
 # Load sysctl config files
 /usr/lib/systemd/systemd-sysctl
+
 # Load additional binary formats
 mountpoint -q /proc/sys/fs/binfmt_misc || mount /proc/sys/fs/binfmt_misc &>/dev/null || mount -t binfmt_misc binfmt /proc/sys/fs/binfmt_misc
 /usr/lib/systemd/systemd-binfmt
-bootlogd_stop
 
 rm -f /run/nologin
diff --git a/abs/core/runit-scripts/runitscripts/3 b/abs/core/runit-scripts/runitscripts/3
index 1a4b384..062f2c6 100755
--- a/abs/core/runit-scripts/runitscripts/3
+++ b/abs/core/runit-scripts/runitscripts/3
@@ -1,7 +1,26 @@
 #!/bin/sh
+
+PATH=/bin:/sbin:/usr/bin:/usr/sbin
+
 clear
 . /etc/rc.conf
 . /etc/rc.d/functions
+
+#continue plymouthd that was stopped in /etc/X11/Sessions/Linhes
+cp -f /run/plymouth.pid /tmp/plymouthd
+pidfile=/run/plymouth.pid
+if [ -e "$pidfile" ]; then
+    plypid=`cat "$pidfile"`
+    if [ -n "$plypid" ]; then
+        kill -s CONT "$plypid"
+    fi
+fi
+
+stat_busy "Waiting for services to stop..."
+sv -w196 force-stop /service/*
+sv exit /service/*
+stat_done
+
 for i in `seq 3`
 do
 echo " " > /dev/tty1
@@ -18,8 +37,11 @@ then
     /etc/runit/3.local
     stat_done
 fi
-/usr/sbin/ethtool -s  eth0 wol g 2>/dev/null
-/usr/sbin/ethtool -s  eth1 wol g 2>/dev/null
-/usr/sbin/ethtool -s  eth2 wol g 2>/dev/null
+
+ethtool -s  eth0 wol g 2>/dev/null
+ethtool -s  eth1 wol g 2>/dev/null
+ethtool -s  eth2 wol g 2>/dev/null
+
+plymouth quit --retain-splash
 
 /etc/rc.shutdown
diff --git a/abs/core/runit-scripts/runitscripts/ctrlaltdel b/abs/core/runit-scripts/runitscripts/ctrlaltdel
index 30c317b..d7cfcc0 100755
--- a/abs/core/runit-scripts/runitscripts/ctrlaltdel
+++ b/abs/core/runit-scripts/runitscripts/ctrlaltdel
@@ -1,4 +1,2 @@
 #!/bin/sh
-
-PATH=/bin:/usr/bin
-/sbin/reboot
+reboot
diff --git a/abs/core/runit-scripts/runitscripts/logger b/abs/core/runit-scripts/runitscripts/logger-runit
index 6888f6f..97d9f6e 100755
--- a/abs/core/runit-scripts/runitscripts/logger
+++ b/abs/core/runit-scripts/runitscripts/logger-runit
@@ -8,4 +8,4 @@ then
 	chmod 700 /var/log/$svname
 fi
 
-exec /sbin/svlogd -tt /var/log/$svname
+exec /usr/bin/svlogd -tt /var/log/$svname
diff --git a/abs/core/runit-scripts/runitscripts/services/acpid/run b/abs/core/runit-scripts/runitscripts/services/acpid/run
index 808808f..ef4434e 100755
--- a/abs/core/runit-scripts/runitscripts/services/acpid/run
+++ b/abs/core/runit-scripts/runitscripts/services/acpid/run
@@ -5,4 +5,4 @@ export TERM=linux
 . /etc/rc.d/functions
 svwaitup -s 10 /service/rsyslog
 stat_runit "Starting acpid"
-exec /usr/sbin/acpid  -f -l  -c /etc/acpi/events  
+exec /usr/bin/acpid  -f -l  -c /etc/acpi/events  
diff --git a/abs/core/runit-scripts/runitscripts/services/alsa-utils/finish b/abs/core/runit-scripts/runitscripts/services/alsa-utils/finish
index d6f3897..84e3f81 100755
--- a/abs/core/runit-scripts/runitscripts/services/alsa-utils/finish
+++ b/abs/core/runit-scripts/runitscripts/services/alsa-utils/finish
@@ -1,3 +1,3 @@
 #!/bin/sh
-exec 2>&1
-sv down alsa-utils
+set -e
+exec /usr/bin/alsactl store
diff --git a/abs/core/runit-scripts/runitscripts/services/alsa-utils/run b/abs/core/runit-scripts/runitscripts/services/alsa-utils/run
index 17f5f99..a376059 100755
--- a/abs/core/runit-scripts/runitscripts/services/alsa-utils/run
+++ b/abs/core/runit-scripts/runitscripts/services/alsa-utils/run
@@ -1,3 +1,4 @@
 #!/bin/sh
-exec 2>&1
-exec /etc/rc.d/alsa start
+set -e
+/usr/bin/alsactl restore
+exec chpst -b alsa pause
diff --git a/abs/core/runit-scripts/runitscripts/services/autofs/run b/abs/core/runit-scripts/runitscripts/services/autofs/run
index 342ade6..d6659c4 100755
--- a/abs/core/runit-scripts/runitscripts/services/autofs/run
+++ b/abs/core/runit-scripts/runitscripts/services/autofs/run
@@ -6,7 +6,7 @@ exec 2>&1
 
 stat_runit "Starting autofs4 kernel module" && echo ""
 set -e  # barf if modprobe fails
-/sbin/modprobe autofs4
+/usr/bin/modprobe autofs4
 
 stat_runit "Starting autofs automount" && echo ""
 # source application-specific settings
@@ -16,4 +16,4 @@ if [ ! -z "$TIMEOUT" ]; then
   daemonoptions="--timeout=$TIMEOUT $daemonoptions"
 fi
 
-exec /usr/sbin/automount -f $daemonoptions
+exec /usr/bin/automount -f $daemonoptions
diff --git a/abs/core/runit-scripts/runitscripts/services/avahi/run b/abs/core/runit-scripts/runitscripts/services/avahi/run
index b9b4905..bd34449 100755
--- a/abs/core/runit-scripts/runitscripts/services/avahi/run
+++ b/abs/core/runit-scripts/runitscripts/services/avahi/run
@@ -6,5 +6,5 @@ export TERM=linux
 stat_runit "Starting Avahi"
 
 
-exec /usr/sbin/avahi-daemon  >/dev/null 2>/dev/null
+exec /usr/bin/avahi-daemon  >/dev/null 2>/dev/null
 
diff --git a/abs/core/runit-scripts/runitscripts/services/bluetoothd/run b/abs/core/runit-scripts/runitscripts/services/bluetoothd/run
index 15d3bb2..9b25f0b 100755
--- a/abs/core/runit-scripts/runitscripts/services/bluetoothd/run
+++ b/abs/core/runit-scripts/runitscripts/services/bluetoothd/run
@@ -6,9 +6,7 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth
+/usr/bin/svwaitup -s 15 /service/dbus || exit 1
+stat_runit "Starting bluetooth"
 
-/sbin/svwaitup -s 15 /service/dbus || exit 1
-stat_runit "Starting bluetooth subsystem:"
-
-exec /usr/sbin/bluetoothd -n >/dev/null
+exec /usr/bin/bluetoothctl
diff --git a/abs/core/runit-scripts/runitscripts/services/cron/run b/abs/core/runit-scripts/runitscripts/services/cron/run
index bf5787a..5bb2175 100755
--- a/abs/core/runit-scripts/runitscripts/services/cron/run
+++ b/abs/core/runit-scripts/runitscripts/services/cron/run
@@ -6,4 +6,4 @@ stat_runit "Starting Cron"
 
 
 exec 2>&1
-exec /usr/sbin/crond -f -M /usr/bin/postfix -l info
+exec /usr/bin/crond -f -M /usr/bin/postfix -l info
diff --git a/abs/core/runit-scripts/runitscripts/services/ddclient/run b/abs/core/runit-scripts/runitscripts/services/ddclient/run
index c5488f6..955f565 100755
--- a/abs/core/runit-scripts/runitscripts/services/ddclient/run
+++ b/abs/core/runit-scripts/runitscripts/services/ddclient/run
@@ -5,4 +5,4 @@ export TERM=linux
 stat_runit "Starting ddclient"
 
 
-exec /usr/sbin/ddclient -foreground &> /var/log/ddclient.log
+exec /usr/bin/ddclient -foreground &> /var/log/ddclient.log
diff --git a/abs/core/runit-scripts/runitscripts/services/dhcpd/run b/abs/core/runit-scripts/runitscripts/services/dhcpd/run
index 38ae40a..8711cd6 100755
--- a/abs/core/runit-scripts/runitscripts/services/dhcpd/run
+++ b/abs/core/runit-scripts/runitscripts/services/dhcpd/run
@@ -5,4 +5,4 @@ export TERM=linux
 stat_runit "Starting dhcpd"
 
 
-exec /usr/sbin/dhcpd -f &> /var/log/dhcpd.log
+exec /usr/bin/dhcpd -f &> /var/log/dhcpd.log
diff --git a/abs/core/runit-scripts/runitscripts/services/dnsmasq/run b/abs/core/runit-scripts/runitscripts/services/dnsmasq/run
index f14c51a..d07ab7b 100755
--- a/abs/core/runit-scripts/runitscripts/services/dnsmasq/run
+++ b/abs/core/runit-scripts/runitscripts/services/dnsmasq/run
@@ -6,5 +6,5 @@ export TERM=linux
 stat_runit "Starting dns services"
 
 
-exec /usr/sbin/dnsmasq -k   >/dev/null 2>/dev/null
+exec /usr/bin/dnsmasq -k   >/dev/null 2>/dev/null
 
diff --git a/abs/core/runit-scripts/runitscripts/services/evrouter/run b/abs/core/runit-scripts/runitscripts/services/evrouter/run
index 7d9e1d2..82d0268 100755
--- a/abs/core/runit-scripts/runitscripts/services/evrouter/run
+++ b/abs/core/runit-scripts/runitscripts/services/evrouter/run
@@ -16,6 +16,7 @@ then
 		sv start Xvfb
 	fi
 	
-	su mythtv -c "DISPLAY=localhost:50 evrouter -c /etc/evrouter.cfg -f /dev/input/event*"
+	#su mythtv -c "DISPLAY=localhost:50 evrouter -c /etc/evrouter.cfg -f /dev/input/event*"
+	exec sudo -u mythtv -i DISPLAY=localhost:50 evrouter -c /etc/evrouter.cfg -f /dev/input/event*
 fi
 
diff --git a/abs/core/runit-scripts/runitscripts/services/frontend/finish b/abs/core/runit-scripts/runitscripts/services/frontend/finish
index 417488d..d96bcf0 100755
--- a/abs/core/runit-scripts/runitscripts/services/frontend/finish
+++ b/abs/core/runit-scripts/runitscripts/services/frontend/finish
@@ -1,14 +1,23 @@
-#!/bin/bash                                                
-exec 2>&1                                                  
-export TERM=linux                                          
-. /etc/rc.conf                                             
-. /etc/rc.d/functions                                      
+#!/bin/bash
+exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
 
 function cleanup(){
              rm -f /etc/sv/frontend/.runtime/*
              printhl  "    Cleaning up  /etc/sv/frontend/.runtime/"
 }
 
+#continue plymouthd that was stopped in /etc/X11/Sessions/Linhes
+pidfile=/run/plymouth.pid
+if [ -e "$pidfile" ]; then
+    plypid=`cat "$pidfile"`
+    if [ -n "$plypid" ]; then
+        kill -s CONT "$plypid"
+    fi
+fi
+
 grep -q  nox /proc/cmdline
 STATUS=$?
  if  [ $STATUS = 0 ]
@@ -42,4 +51,3 @@ else
          fi
     fi
 fi
-
diff --git a/abs/core/runit-scripts/runitscripts/services/frontend/run b/abs/core/runit-scripts/runitscripts/services/frontend/run
index 3711058..22b65db 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 /bin/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/hal/run b/abs/core/runit-scripts/runitscripts/services/hal/run
index a6d5c0e..fe2f2c6 100755
--- a/abs/core/runit-scripts/runitscripts/services/hal/run
+++ b/abs/core/runit-scripts/runitscripts/services/hal/run
@@ -5,4 +5,4 @@ export TERM=linux
 . /etc/rc.d/functions
 svwaitup dbus 2>/dev/null 1>/dev/null
 stat_runit "Starting Hal"
-exec /usr/sbin/hald --daemon=no --use-syslog 2>/dev/null >/dev/null
+exec /usr/bin/hald --daemon=no --use-syslog 2>/dev/null >/dev/null
diff --git a/abs/core/runit-scripts/runitscripts/services/inadyn/run b/abs/core/runit-scripts/runitscripts/services/inadyn/run
new file mode 100644
index 0000000..6b4d844
--- /dev/null
+++ b/abs/core/runit-scripts/runitscripts/services/inadyn/run
@@ -0,0 +1,4 @@
+#!/bin/bash
+exec 2>&1
+. /etc/systemconfig
+exec /usr/bin/inadyn -u $DDnslogin -p $DDnspassword -a $DDnshostname --syslog
diff --git a/abs/core/runit-scripts/runitscripts/services/irqbalance/run b/abs/core/runit-scripts/runitscripts/services/irqbalance/run
index 6342868..83b6268 100755
--- a/abs/core/runit-scripts/runitscripts/services/irqbalance/run
+++ b/abs/core/runit-scripts/runitscripts/services/irqbalance/run
@@ -13,4 +13,4 @@ fi
 
 stat_runit "Starting irqbalance"
 
-exec /usr/sbin/irqbalance --debug $ONESHOT_CMD >/dev/null
+exec /usr/bin/irqbalance --debug $ONESHOT_CMD >/dev/null
diff --git a/abs/core/runit-scripts/runitscripts/services/lcdd/run b/abs/core/runit-scripts/runitscripts/services/lcdd/run
index da2258b..2557e1d 100755
--- a/abs/core/runit-scripts/runitscripts/services/lcdd/run
+++ b/abs/core/runit-scripts/runitscripts/services/lcdd/run
@@ -9,7 +9,7 @@ stat_runit "Starting lcdproc"
 exec 2>&1
 if [ x$LCDtype = xxosd ]
 then
-	DISPLAY=127.0.0.1:0 /usr/sbin/LCDd -f -c /etc/LCDd.conf 2>/dev/null >/dev/null
+	DISPLAY=127.0.0.1:0 /usr/bin/LCDd -f -c /etc/LCDd.conf 2>/dev/null >/dev/null
 else
-	exec /usr/sbin/LCDd -f -c /etc/LCDd.conf 2>/dev/null >/dev/null
+	exec /usr/bin/LCDd -f -c /etc/LCDd.conf 2>/dev/null >/dev/null
 fi
diff --git a/abs/core/runit-scripts/runitscripts/services/lighttpd/run b/abs/core/runit-scripts/runitscripts/services/lighttpd/run
index 3ac10e5..73c183f 100755
--- a/abs/core/runit-scripts/runitscripts/services/lighttpd/run
+++ b/abs/core/runit-scripts/runitscripts/services/lighttpd/run
@@ -25,4 +25,4 @@ if [ ! -d /var/run/lighttpd ] ; then
 fi
 
 # Using -angel to start lighttpd allows lighttpd to accept signals
-exec /usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf
+exec /usr/bin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf
diff --git a/abs/core/runit-scripts/runitscripts/services/mythbackend/run b/abs/core/runit-scripts/runitscripts/services/mythbackend/run
index e24fc3d..d97cf21 100755
--- a/abs/core/runit-scripts/runitscripts/services/mythbackend/run
+++ b/abs/core/runit-scripts/runitscripts/services/mythbackend/run
@@ -14,12 +14,12 @@ fi
 #wait for mysql
 if [ -e /service/mysql ]
 then
-    /sbin/svwaitup -s 10 /service/mysql
+    /usr/bin/svwaitup -s 10 /service/mysql
 fi
 
 if [ -e /service/avahi ]
 then
-    /sbin/svwaitup -s 2 /service/avahi
+    /usr/bin/svwaitup -s 2 /service/avahi
 fi
 
 #profile is here to setup LC_ALL/locale
@@ -79,5 +79,5 @@ export HOME=/root
                 stat_runit "Starting Primary MythBackend"
             fi
 
-            exec su mythtv -c "/usr/bin/mythbackend -q --syslog local6"
+            exec sudo -u mythtv /usr/bin/mythbackend -q --syslog local6
 # 		fi
diff --git a/abs/core/runit-scripts/runitscripts/services/mythexport/run b/abs/core/runit-scripts/runitscripts/services/mythexport/run
index 45f77fd..824ccb2 100755
--- a/abs/core/runit-scripts/runitscripts/services/mythexport/run
+++ b/abs/core/runit-scripts/runitscripts/services/mythexport/run
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-/sbin/chpst -u mythtv /usr/bin/mythexport-daemon
+/usr/bin/chpst -u mythtv /usr/bin/mythexport-daemon
 
 PID=`pidof -o %PPID -x /usr/bin/mythexport-daemon`
 
diff --git a/abs/core/runit-scripts/runitscripts/services/mythexpress/run b/abs/core/runit-scripts/runitscripts/services/mythexpress/run
index db3eba1..06e4a1b 100755
--- a/abs/core/runit-scripts/runitscripts/services/mythexpress/run
+++ b/abs/core/runit-scripts/runitscripts/services/mythexpress/run
@@ -3,7 +3,6 @@ exec 2>&1
 export TERM=linux
 . /etc/rc.conf
 . /etc/rc.d/functions
-/sbin/svwaitup -s 10 /service/avahi
+/usr/bin/svwaitup -s 10 /service/avahi
 stat_runit "Starting MythExpress"
-exec su  http -s/bin/bash -c "node /usr/mythexpress/app.js"
-
+exec chpst -u http node /usr/mythexpress/app.js
diff --git a/abs/core/runit-scripts/runitscripts/services/ncid-server/run b/abs/core/runit-scripts/runitscripts/services/ncid-server/run
index 337b028..4526fae 100644
--- a/abs/core/runit-scripts/runitscripts/services/ncid-server/run
+++ b/abs/core/runit-scripts/runitscripts/services/ncid-server/run
@@ -9,12 +9,12 @@ stat_runit "Starting caller id server (ncid)"
 exec 2>&1
 if [ -f /etc/ncid/ncidd-user.conf ]
 then
-    exec /usr/sbin/ncidd -D -C /etc/ncid/ncidd-user.conf 
+    exec /usr/bin/ncidd -D -C /etc/ncid/ncidd-user.conf
 else
     if [ x$nciddDeviceNetCallerID = "x1" ]
     then
-        exec /usr/sbin/ncidd -D -t /dev/$nciddSerialPort --nomodem 1 -S 4800
+        exec /usr/bin/ncidd -D -t /dev/$nciddSerialPort --nomodem 1 -S 4800
     else
-        exec /usr/sbin/ncidd -D -t /dev/$nciddSerialPort -S 4800
+        exec /usr/bin/ncidd -D -t /dev/$nciddSerialPort -S 4800
     fi
 fi
diff --git a/abs/core/runit-scripts/runitscripts/services/nfs-common/finish b/abs/core/runit-scripts/runitscripts/services/nfs-common/finish
index 531192d..fddac0c 100755
--- a/abs/core/runit-scripts/runitscripts/services/nfs-common/finish
+++ b/abs/core/runit-scripts/runitscripts/services/nfs-common/finish
@@ -5,19 +5,19 @@ daemon_name=nfs-common
 . /etc/rc.conf
 . /etc/rc.d/functions
 . /etc/conf.d/$daemon_name.conf
-                                    
+
 
 # rpc.statd daemon & binary location
 STATD_DAEMON_NAME=rpc.statd
-STATD="/usr/sbin/rpc.statd"
+STATD="/usr/bin/rpc.statd"
 
 # rpc.idmapd daemon & binary location
 IDMAPD_DAEMON_NAME=rpc.idmapd
-IDMAPD="/usr/sbin/rpc.idmapd"
+IDMAPD="/usr/bin/rpc.idmapd"
 
 # rpc.gssd daemon & binary location
 GSSD_DAEMON_NAME=rpc.gssd
-GSSD="/usr/sbin/rpc.gssd"
+GSSD="/usr/bin/rpc.gssd"
 
 do_umount() {
     if mountpoint -q "$1" ; then
@@ -29,7 +29,6 @@ do_umount() {
 get_pid() {
         pidof -o %PPID "$1"
 }
-        
 
 stat_runit "Stopping $GSSD_DAEMON_NAME daemon"
 PID=$(get_pid $GSSD)
diff --git a/abs/core/runit-scripts/runitscripts/services/nfs-common/run b/abs/core/runit-scripts/runitscripts/services/nfs-common/run
index f0dbb6e..10532ac 100755
--- a/abs/core/runit-scripts/runitscripts/services/nfs-common/run
+++ b/abs/core/runit-scripts/runitscripts/services/nfs-common/run
@@ -9,15 +9,15 @@ daemon_name=nfs-common
 
 # rpc.statd daemon & binary location
 STATD_DAEMON_NAME=rpc.statd
-STATD="/usr/sbin/rpc.statd"
+STATD="/usr/bin/rpc.statd"
 
 # rpc.idmapd daemon & binary location
 IDMAPD_DAEMON_NAME=rpc.idmapd
-IDMAPD="/usr/sbin/rpc.idmapd"
+IDMAPD="/usr/bin/rpc.idmapd"
 
 # rpc.gssd daemon & binary location
 GSSD_DAEMON_NAME=rpc.gssd
-GSSD="/usr/sbin/rpc.gssd"
+GSSD="/usr/bin/rpc.gssd"
 
 
 # Default mountpoint and options for rpc_pipefs filesystem
@@ -27,7 +27,7 @@ GSSD="/usr/sbin/rpc.gssd"
 
 
 do_modprobe() {
-    if [ -x /sbin/modprobe -a -f /proc/modules ]; then
+    if [ -x /usr/bin/modprobe -a -f /proc/modules ]; then
       modprobe -q "$1" || true
     fi
 }
@@ -36,7 +36,7 @@ do_mount() {
     if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then
       return 1
     fi
-    
+
     if grep -vw "$1" /proc/mounts &> /dev/null ; then
       if ! mountpoint -q "$2" ; then
 	mount -t "$1" "$1" "$2" -o "$3"
@@ -63,14 +63,14 @@ get_pid() {
 
 
 stat_runit "Starting NFS-common: $daemon_name"
-svwaitup rpcbind  >/dev/null 2>/dev/null   
+svwaitup rpcbind  >/dev/null 2>/dev/null
 
 printhl "    NFS-common: sm-notify"
-/usr/sbin/sm-notify $SMNOTIFY_OPTS >/dev/null 2>/dev/null
+/usr/bin/sm-notify $SMNOTIFY_OPTS >/dev/null 2>/dev/null
 do_modprobe sunrpc
 do_modprobe nfs
 do_modprobe nfsd
-do_mount rpc_pipefs "$PIPEFS_MOUNTPOINT" "$PIPEFS_MOUNTOPTS" 
+do_mount rpc_pipefs "$PIPEFS_MOUNTPOINT" "$PIPEFS_MOUNTOPTS"
 
 
 printhl "    NFS-common: $IDMAPD_DAEMON_NAME"
diff --git a/abs/core/runit-scripts/runitscripts/services/nfsd/run b/abs/core/runit-scripts/runitscripts/services/nfsd/run
index f043143..639c0cc 100755
--- a/abs/core/runit-scripts/runitscripts/services/nfsd/run
+++ b/abs/core/runit-scripts/runitscripts/services/nfsd/run
@@ -11,7 +11,7 @@ svwaitup /var/service/nfs-common >/dev/null 2>/dev/null
 
 source /etc/conf.d/nfs-server.conf
 
-NFSD="/usr/sbin/rpc.nfsd"
+NFSD="/usr/bin/rpc.nfsd"
 
 
 
@@ -23,7 +23,7 @@ NFSD="/usr/sbin/rpc.nfsd"
 [ -z "$PROCNFSD_MOUNTOPTS" ] && PROCNFSD_MOUNTOPTS="rw,nodev,noexec,nosuid"
 
 do_modprobe() {
-    if [ -x /sbin/modprobe -a -f /proc/modules ]; then
+    if [ -x /usr/bin/modprobe -a -f /proc/modules ]; then
       modprobe -q "$1" || true
     fi
 }
@@ -60,11 +60,11 @@ do_modprobe nfsd
 do_mount nfsd "$PROCNFSD_MOUNTPOINT" "$PROCNFSD_MOUNTOPTS"
 
 # Re-export all directories in /etc/exports
-/usr/sbin/exportfs -ra > /dev/null 2>/dev/null
+/usr/bin/exportfs -ra > /dev/null 2>/dev/null
 
  $NFSD $NFSD_OPTS $NFSD_COUNT
 
 
 # 
-exec /usr/sbin/rpc.mountd --foreground  >/dev/null 2>/dev/null  
+exec /usr/bin/rpc.mountd --foreground  >/dev/null 2>/dev/null  
 
diff --git a/abs/core/runit-scripts/runitscripts/services/nfslock/run b/abs/core/runit-scripts/runitscripts/services/nfslock/run
index 8d627ad..5ea6842 100755
--- a/abs/core/runit-scripts/runitscripts/services/nfslock/run
+++ b/abs/core/runit-scripts/runitscripts/services/nfslock/run
@@ -4,5 +4,5 @@ export TERM=linux
 . /etc/rc.conf
 . /etc/rc.d/functions
 stat_runit "Starting NFSlock"
-svwaitup portmap  >/dev/null 2>/dev/null   
-/usr/sbin/rpc.statd -F  >/dev/null 2>/dev/null   
+svwaitup portmap  >/dev/null 2>/dev/null
+/usr/bin/rpc.statd -F  >/dev/null 2>/dev/null
diff --git a/abs/core/runit-scripts/runitscripts/services/ntpd/finish b/abs/core/runit-scripts/runitscripts/services/ntpd/finish
index ba564e7..d6873b7 100755
--- a/abs/core/runit-scripts/runitscripts/services/ntpd/finish
+++ b/abs/core/runit-scripts/runitscripts/services/ntpd/finish
@@ -4,4 +4,4 @@ export TERM=linux
 . /etc/rc.d/functions
 stat_runit "Stopping NTPD"
 printhl "    setting hwclock"
-exec /sbin/hwclock --utc -w
+exec /usr/bin/hwclock --utc -w
diff --git a/abs/core/runit-scripts/runitscripts/services/oss/run b/abs/core/runit-scripts/runitscripts/services/oss/run
index 815a34e..aa2720e 100755
--- a/abs/core/runit-scripts/runitscripts/services/oss/run
+++ b/abs/core/runit-scripts/runitscripts/services/oss/run
@@ -7,6 +7,5 @@ stat_runit "Starting OSS"
 
 
 rm -f /usr/lib/oss/starting
-#exec /etc/rc.d/alsa-utils start all
-exec /usr/sbin/soundon
+exec /usr/bin/soundon
 
diff --git a/abs/core/runit-scripts/runitscripts/services/remotes/run b/abs/core/runit-scripts/runitscripts/services/remotes/run
index 19c6375..9fbb16e 100755
--- a/abs/core/runit-scripts/runitscripts/services/remotes/run
+++ b/abs/core/runit-scripts/runitscripts/services/remotes/run
@@ -7,6 +7,11 @@ export TERM=linux
 
 LOG=/tmp/remotes.log
 
+MODPROBE="/usr/bin/modprobe"
+LIRCD="/usr/bin/lircd "
+
+SETSERIAL="/usr/bin/setserial"
+
 if [ -f $LOG ]
 then
     rm -f $LOG
@@ -73,15 +78,15 @@ else
         esac
         
         #set_serial debugging
-        /usr/bin/setserial -va /dev/$serial_port  2>&1 >> $LOG
+        $SETSERIAL -va /dev/$serial_port  2>&1 >> $LOG
         echo '' 2>&1 >> $LOG
         
         #run set_serial command
-        /usr/bin/setserial -v /dev/$serial_port uart none 2>&1 >> $LOG
+        $SETSERIAL -v /dev/$serial_port uart none 2>&1 >> $LOG
         echo '' 2>&1 >> $LOG
         
         #set_serial debugging
-        /usr/bin/setserial -va /dev/$serial_port  2>&1 >> $LOG
+        $SETSERIAL -va /dev/$serial_port  2>&1 >> $LOG
         sleep 1        
              
         #remove lirc_serial
@@ -90,8 +95,8 @@ else
         /usr/bin/rmmod -v lirc_dev 2>> $LOG
         
         echo "*Loading lirc_serial" 2>&1 >> $LOG
-        echo "/sbin/modprobe  lirc_serial $FLAGS" 2>&1 >> $LOG
-        /sbin/modprobe -v lirc_serial $FLAGS 2>&1 >> $LOG
+        echo "$MODPROBE  lirc_serial $FLAGS" 2>&1 >> $LOG
+        $MODPROBE -v lirc_serial $FLAGS 2>&1 >> $LOG
      
         echo "====== lirc modules after load ==========" >> $LOG
         lsmod |grep lirc >> $LOG
@@ -107,7 +112,7 @@ else
 
     if [ x$HostBlasterType = xCommandIR -o x$ReceiverType = xCommandIR ]
     then
-        CMD="/usr/sbin/lircd -r -n  --driver=commandir"
+        CMD="$LIRCD-r -n  --driver=commandir"
         printhl "   Using commandir"
         echo $CMD >>$LOG
         $CMD >>$LOG 2>>$LOG
@@ -115,7 +120,7 @@ else
     elif [ x$HostBlasterType = xiguanaIR-usb -o x$ReceiverType = xiguanaIR-usb ]
     then
         sv start igdaemon
-        CMD="/usr/sbin/lircd -r -n  --driver=iguanaIR"
+        CMD="$LIRCD-r -n  --driver=iguanaIR"
         printhl "       Using iguanaIR usb"
         echo $CMD >>$LOG
         $CMD >>$LOG 2>>$LOG
@@ -123,7 +128,7 @@ else
     elif [ x$ReceiverType = "xSiliconDust_HDHR" ]
     then
         # if using the SiliconDust_HDHR as an I/R Receiver
-        CMD="/usr/sbin/lircd -H udp -d 5000 -n"
+        CMD="$LIRCD-H udp -d 5000 -n"
         printhl "   Using SiliconDust on port 5000"
         echo $CMD >>$LOG
         $CMD >>$LOG 2>>$LOG
@@ -172,7 +177,7 @@ else
                     DEFINED_RECEIVER="False"
                     for i in `seq 1 $num_lirc`
                     do
-                        CMD="/usr/sbin/lircd -r -d /dev/lirc$i --output=/var/run/lirc/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i"
+                        CMD="$LIRCD-r -d /dev/lirc$i --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
@@ -211,24 +216,24 @@ else
             then
                 #start receiver
                 #start blaster  chain
-                CMD="/usr/sbin/lircd -r -d $IRNODE --output=/var/run/lirc/lircd1 --pidfile=/var/run/lircd1.pid --listen=8761"
-                LCMD="/usr/sbin/lircd -r -n -d $BLASTERNODE --output /var/run/lirc/lircd  $LASTCMD"
+                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"
                 echo $CMD >>$LOG
                 $CMD >>$LOG 2>>$LOG
 
             elif [ x$USE_BLASTER = xTrue ]
             then
                 #start only the blaster
-                LCMD="/usr/sbin/lircd -r -n -d $BLASTERNODE --output /var/run/lirc/lircd  $LASTCMD"
+                LCMD="$LIRCD-r -n -d $BLASTERNODE --output /var/run/lirc/lircd  $LASTCMD"
 
             elif [ x$DEFINED_RECEIVER = xTrue ]
             then
                 #start reciever
-                LCMD="/usr/sbin/lircd -r -n -d $IRNODE --output /var/run/lirc/lircd"
+                LCMD="$LIRCD-r -n -d $IRNODE --output /var/run/lirc/lircd"
 
             else
                 #default case of /dev/lirc0
-                LCMD="/usr/sbin/lircd -r -n -d /dev/lirc0 --output /var/run/lirc/lircd  $LASTCMD"
+                LCMD="$LIRCD-r -n -d /dev/lirc0 --output /var/run/lirc/lircd  $LASTCMD"
             fi
 
             echo $LASTCMD >>$LOG
diff --git a/abs/core/runit-scripts/runitscripts/services/remyth/run b/abs/core/runit-scripts/runitscripts/services/remyth/run
index 768ec13..9667b87 100755
--- a/abs/core/runit-scripts/runitscripts/services/remyth/run
+++ b/abs/core/runit-scripts/runitscripts/services/remyth/run
@@ -3,8 +3,7 @@ exec 2>&1
 export TERM=linux
 . /etc/rc.conf
 . /etc/rc.d/functions
-/sbin/svwaitup -s 10 /service/avahi
+/usr/bin/svwaitup -s 10 /service/avahi
 
 stat_runit "Starting ReMyth"
-exec su  http -s/bin/bash -c "node /usr/remyth/server.js"
-
+exec chpst -u http node /usr/remyth/app.js
diff --git a/abs/core/runit-scripts/runitscripts/services/rfcomm/run b/abs/core/runit-scripts/runitscripts/services/rfcomm/run
index 8bc619b..2c2cbb5 100644
--- a/abs/core/runit-scripts/runitscripts/services/rfcomm/run
+++ b/abs/core/runit-scripts/runitscripts/services/rfcomm/run
@@ -14,4 +14,4 @@ svwaitup -s 3 /var/service/bluetoothd || exit 1
 
     stat_runit "Starting RFCOMM for the bluetooth subsystem"
       /usr/bin/rfcomm -f $RFCOMM_CONFIG bind all
-      /sbin/sv down .
+      /usr/bin/sv down .
diff --git a/abs/core/runit-scripts/runitscripts/services/rsyslog/run b/abs/core/runit-scripts/runitscripts/services/rsyslog/run
index e7b018d..f356d10 100755
--- a/abs/core/runit-scripts/runitscripts/services/rsyslog/run
+++ b/abs/core/runit-scripts/runitscripts/services/rsyslog/run
@@ -6,5 +6,5 @@ export TERM=linux
 stat_runit "Starting rsyslog"
 
 
-exec /usr/sbin/rsyslogd -n -c5
+exec /usr/bin/rsyslogd -n -c5
 
diff --git a/abs/core/runit-scripts/runitscripts/services/shellinaboxd/run b/abs/core/runit-scripts/runitscripts/services/shellinaboxd/run
index bc94a73..5916dc1 100755
--- a/abs/core/runit-scripts/runitscripts/services/shellinaboxd/run
+++ b/abs/core/runit-scripts/runitscripts/services/shellinaboxd/run
@@ -5,5 +5,4 @@ export TERM=linux
 . /etc/rc.d/functions
 stat_runit "Starting shellinabox"
 
-
-exec  su - mythtv -c "shellinaboxd -c /etc/lighttpd/ --no-beep"
+exec chpst -umythtv shellinaboxd -c /etc/lighttpd/ --no-beep
diff --git a/abs/core/runit-scripts/runitscripts/services/smartd/finish b/abs/core/runit-scripts/runitscripts/services/smartd/finish
index 7b77994..b93dcf0 100755
--- a/abs/core/runit-scripts/runitscripts/services/smartd/finish
+++ b/abs/core/runit-scripts/runitscripts/services/smartd/finish
@@ -4,6 +4,6 @@
  . /etc/rc.d/functions
 
      stat_runit "Stopping smartd"
-     kill -9 `pidof /usr/sbin/smartd` &>/dev/null
+     kill -9 `pidof /usr/bin/smartd` &>/dev/null
      rm_daemon smartd
      stat_done
diff --git a/abs/core/runit-scripts/runitscripts/services/smartd/run b/abs/core/runit-scripts/runitscripts/services/smartd/run
index b8eafb6..f4f70c1 100755
--- a/abs/core/runit-scripts/runitscripts/services/smartd/run
+++ b/abs/core/runit-scripts/runitscripts/services/smartd/run
@@ -5,4 +5,4 @@
 
 stat_runit "Starting smartd"
 
-  exec /usr/sbin/smartd -n -c /etc/smartd.conf -q never &>/dev/null
+exec /usr/bin/smartd -n -c /etc/smartd.conf -q never &>/dev/null
diff --git a/abs/core/runit-scripts/runitscripts/services/sshd/run b/abs/core/runit-scripts/runitscripts/services/sshd/run
index fc22e3b..ec1525c 100755
--- a/abs/core/runit-scripts/runitscripts/services/sshd/run
+++ b/abs/core/runit-scripts/runitscripts/services/sshd/run
@@ -10,4 +10,4 @@ stat_runit "Starting SSH"
     [ -f /etc/ssh/ssh_host_dsa_key ] || { /usr/bin/ssh-keygen -t dsa -N "" -f /etc/ssh/ssh_host_dsa_key >/dev/null; }
 
 
-exec /usr/sbin/sshd -D >/dev/null 2>/dev/null
+exec /usr/bin/sshd -D >/dev/null 2>/dev/null
diff --git a/abs/core/runit-scripts/runitscripts/services/syslog-ng/run b/abs/core/runit-scripts/runitscripts/services/syslog-ng/run
deleted file mode 100755
index 8633a77..0000000
--- a/abs/core/runit-scripts/runitscripts/services/syslog-ng/run
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting syslog"
-
-
-exec /usr/sbin/syslog-ng -F
-
diff --git a/abs/core/runit-scripts/runitscripts/services/tftpd/run b/abs/core/runit-scripts/runitscripts/services/tftpd/run
index 8f742ca..4a90b09 100755
--- a/abs/core/runit-scripts/runitscripts/services/tftpd/run
+++ b/abs/core/runit-scripts/runitscripts/services/tftpd/run
@@ -5,4 +5,4 @@ export TERM=linux
 stat_runit "Starting tftpd"
 
 
-exec /usr/sbin/in.tftpd --foreground -s /tftpboot
+exec /usr/bin/in.tftpd --foreground -s /tftpboot
diff --git a/abs/core/runit-scripts/runitscripts/services/tty2/run b/abs/core/runit-scripts/runitscripts/services/tty2/run
index b2a4fa6..26b0658 100755
--- a/abs/core/runit-scripts/runitscripts/services/tty2/run
+++ b/abs/core/runit-scripts/runitscripts/services/tty2/run
@@ -4,4 +4,4 @@ export TERM=linux
 . /etc/rc.d/functions
 stat_runit "Starting Agetty 2"
 
-exec /sbin/agetty 38400 tty2 linux
+exec /usr/bin/agetty 38400 tty2 linux
diff --git a/abs/core/runit-scripts/runitscripts/services/tty3/run b/abs/core/runit-scripts/runitscripts/services/tty3/run
index 0bafcd4..a227ea5 100755
--- a/abs/core/runit-scripts/runitscripts/services/tty3/run
+++ b/abs/core/runit-scripts/runitscripts/services/tty3/run
@@ -3,4 +3,4 @@ export TERM=linux
 . /etc/rc.conf
 . /etc/rc.d/functions
 stat_runit "Starting Agetty 3"
-exec /sbin/agetty 38400 tty3 linux
+exec /usr/bin/agetty 38400 tty3 linux
diff --git a/abs/core/runit-scripts/runitscripts/services/vnc/finish b/abs/core/runit-scripts/runitscripts/services/vnc/finish
index 605a0c4..c026673 100755
--- a/abs/core/runit-scripts/runitscripts/services/vnc/finish
+++ b/abs/core/runit-scripts/runitscripts/services/vnc/finish
@@ -6,7 +6,7 @@ export TERM=linux
 . /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"
+sudo -u vncsvc vncserver -kill :1
 XFILE="/tmp/.X11-unix/X1"
 if [ -e $XFILE ]
 then
diff --git a/abs/core/runit-scripts/runitscripts/services/vnc/run b/abs/core/runit-scripts/runitscripts/services/vnc/run
index 1c01371..bc411b1 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 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/webmin/run b/abs/core/runit-scripts/runitscripts/services/webmin/run
new file mode 100644
index 0000000..659c6cd
--- /dev/null
+++ b/abs/core/runit-scripts/runitscripts/services/webmin/run
@@ -0,0 +1,11 @@
+#!/bin/sh
+echo Starting Webmin server in /opt/webmin
+trap '' 1
+LANG=
+export LANG
+#PERLIO=:raw
+unset PERLIO
+export PERLIO
+PERLLIB=/opt/webmin
+export PERLLIB
+exec '/opt/webmin/miniserv.pl' /etc/webmin/miniserv.conf
diff --git a/abs/core/runit-scripts/runitscripts/services/zoneminder/run b/abs/core/runit-scripts/runitscripts/services/zoneminder/run
index dfd15f3..050f511 100755
--- a/abs/core/runit-scripts/runitscripts/services/zoneminder/run
+++ b/abs/core/runit-scripts/runitscripts/services/zoneminder/run
@@ -6,7 +6,7 @@ MYTH_RUN_STATUS="1"
 . /etc/rc.conf
 . /etc/rc.d/functions
 #wait for mysql
-/sbin/svwaitup -s 20 /service/mysql
+/usr/bin/svwaitup -s 20 /service/mysql
 
 stat_runit "Starting ZoneMinder"
 /usr/bin/zmpkg.pl start  2>/tmp/zoneminder.out
@@ -20,7 +20,7 @@ then
    done
 else
   stat_runit "Zoneminder did not start correctly"
-fi 
+fi