From 237df8ca287f8109dad86a73072853fd8d7670ff Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 15 Apr 2014 20:38:18 +0000
Subject: runit-scripts: update /sbin dirs to /usr/bin. refs #961

---
 abs/core/runit-scripts/PKGBUILD                          |  2 +-
 abs/core/runit-scripts/runitscripts/logger-runit         |  2 +-
 abs/core/runit-scripts/runitscripts/services/acpid/run   |  2 +-
 abs/core/runit-scripts/runitscripts/services/autofs/run  |  4 ++--
 abs/core/runit-scripts/runitscripts/services/avahi/run   |  2 +-
 .../runit-scripts/runitscripts/services/bluetoothd/run   |  4 ++--
 abs/core/runit-scripts/runitscripts/services/cron/run    |  2 +-
 .../runit-scripts/runitscripts/services/ddclient/run     |  2 +-
 abs/core/runit-scripts/runitscripts/services/dhcpd/run   |  2 +-
 abs/core/runit-scripts/runitscripts/services/dnsmasq/run |  2 +-
 abs/core/runit-scripts/runitscripts/services/hal/run     |  2 +-
 .../runit-scripts/runitscripts/services/irqbalance/run   |  2 +-
 abs/core/runit-scripts/runitscripts/services/lcdd/run    |  4 ++--
 .../runit-scripts/runitscripts/services/lighttpd/run     |  2 +-
 .../runit-scripts/runitscripts/services/mythbackend/run  |  4 ++--
 .../runit-scripts/runitscripts/services/mythexport/run   |  2 +-
 .../runit-scripts/runitscripts/services/mythexpress/run  |  2 +-
 .../runit-scripts/runitscripts/services/ncid-server/run  |  6 +++---
 .../runitscripts/services/nfs-common/finish              |  9 ++++-----
 .../runit-scripts/runitscripts/services/nfs-common/run   | 16 ++++++++--------
 abs/core/runit-scripts/runitscripts/services/nfsd/run    |  8 ++++----
 abs/core/runit-scripts/runitscripts/services/nfslock/run |  4 ++--
 abs/core/runit-scripts/runitscripts/services/ntpd/finish |  2 +-
 abs/core/runit-scripts/runitscripts/services/oss/run     |  3 +--
 abs/core/runit-scripts/runitscripts/services/remotes/run | 16 ++--------------
 abs/core/runit-scripts/runitscripts/services/remyth/run  |  2 +-
 abs/core/runit-scripts/runitscripts/services/rfcomm/run  |  2 +-
 abs/core/runit-scripts/runitscripts/services/rsyslog/run |  2 +-
 .../runit-scripts/runitscripts/services/shellinaboxd/run |  3 +--
 .../runit-scripts/runitscripts/services/smartd/finish    |  2 +-
 abs/core/runit-scripts/runitscripts/services/smartd/run  |  2 +-
 abs/core/runit-scripts/runitscripts/services/sshd/run    |  2 +-
 .../runit-scripts/runitscripts/services/syslog-ng/run    | 10 ----------
 abs/core/runit-scripts/runitscripts/services/tftpd/run   |  2 +-
 abs/core/runit-scripts/runitscripts/services/tty2/run    |  2 +-
 abs/core/runit-scripts/runitscripts/services/tty3/run    |  2 +-
 .../runit-scripts/runitscripts/services/zoneminder/run   |  4 ++--
 37 files changed, 58 insertions(+), 83 deletions(-)
 delete mode 100755 abs/core/runit-scripts/runitscripts/services/syslog-ng/run

diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index d97d14f..6525ba3 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=runit-scripts
 pkgver=8.1
-pkgrel=15
+pkgrel=16
 pkgdesc="collection of startup scripts for runit"
 url="http://smarden.org/runit/"
 license="BSD"
diff --git a/abs/core/runit-scripts/runitscripts/logger-runit b/abs/core/runit-scripts/runitscripts/logger-runit
index 6888f6f..97d9f6e 100755
--- a/abs/core/runit-scripts/runitscripts/logger-runit
+++ 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/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..5b3e1be 100755
--- a/abs/core/runit-scripts/runitscripts/services/bluetoothd/run
+++ b/abs/core/runit-scripts/runitscripts/services/bluetoothd/run
@@ -8,7 +8,7 @@
 
 [ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth
 
-/sbin/svwaitup -s 15 /service/dbus || exit 1
+/usr/bin/svwaitup -s 15 /service/dbus || exit 1
 stat_runit "Starting bluetooth subsystem:"
 
-exec /usr/sbin/bluetoothd -n >/dev/null
+exec /usr/bin/bluetoothd -n >/dev/null
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/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/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..8afd737 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
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..7410f43 100755
--- a/abs/core/runit-scripts/runitscripts/services/mythexpress/run
+++ b/abs/core/runit-scripts/runitscripts/services/mythexpress/run
@@ -3,7 +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 MythExpress"
 exec su  http -s/bin/bash -c "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 d0efe53..9fbb16e 100755
--- a/abs/core/runit-scripts/runitscripts/services/remotes/run
+++ b/abs/core/runit-scripts/runitscripts/services/remotes/run
@@ -7,20 +7,8 @@ export TERM=linux
 
 LOG=/tmp/remotes.log
 
-if [ -f /sbin/modprobe ]
-then
-  MODPROBE="/sbin/modprobe"
-else
-  MODPROBE="/usr/bin/modprobe"
-fi
-
-if [ -f /usr/sbin/lircd ]
-then
- LIRCD="/usr/sbin/lircd "
-else
- LIRCD="/usr/bin/lircd "
-fi
-
+MODPROBE="/usr/bin/modprobe"
+LIRCD="/usr/bin/lircd "
 
 SETSERIAL="/usr/bin/setserial"
 
diff --git a/abs/core/runit-scripts/runitscripts/services/remyth/run b/abs/core/runit-scripts/runitscripts/services/remyth/run
index 768ec13..430d535 100755
--- a/abs/core/runit-scripts/runitscripts/services/remyth/run
+++ b/abs/core/runit-scripts/runitscripts/services/remyth/run
@@ -3,7 +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"
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 cddfe08..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 shellinaboxd -u 1000 -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/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
 
 
 
-- 
cgit v0.12

