runit, runitscripts:

update binary path to /usr/bin
refs #961

5 files changed, 37 insertions, 21 deletions

diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index 68ccd2f..9b32d76 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=runit-scripts
 pkgver=8.1
-pkgrel=7
+pkgrel=10
 pkgdesc="collection of startup scripts for runit"
 url="http://smarden.org/runit/"
 license="BSD"
@@ -22,14 +22,15 @@ package() {
   install -d $pkgdir/etc/
   install -d $pkgdir/etc/runit/
   install -d $pkgdir/etc/sv
-  install -d $pkgdir/sbin
+  install -d $pkgdir/usr/bin
   install -d $pkgdir/etc/rc.d/functions.d
   
   #this file contains the function runit-stat  which is needed by the runit service scripts
   install -m755 $srcdir/fbsplash-runit.sh $pkgdir/etc/rc.d/functions.d/fbsplash-runit.sh
   
   install -m0700 1 2 3 1.local 3.local ctrlaltdel $pkgdir/etc/runit
-  install -m0755 reboot-runit halt-runit logger $pkgdir/sbin
+  #install -m0755 reboot-runit halt-runit logger $pkgdir/usr/bin
+  #install -m0755  logger $pkgdir/usr/bin
   rsync -a --exclude=.svn services/* $pkgdir/etc/sv
   chmod -R  755 $pkgdir/etc/sv
   chown -R root:root $pkgdir/etc/sv
diff --git a/abs/core/runit-scripts/__changelog b/abs/core/runit-scripts/__changelog
index 8b13789..cac3cd3 100644
--- a/abs/core/runit-scripts/__changelog
+++ b/abs/core/runit-scripts/__changelog
@@ -1 +1 @@
-
+removed logger to prevent conflicts with util-linux
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..6888f6f 100755
--- a/abs/core/runit-scripts/runitscripts/logger
+++ b/abs/core/runit-scripts/runitscripts/logger-runit
diff --git a/abs/core/runit-scripts/runitscripts/services/remotes/run b/abs/core/runit-scripts/runitscripts/services/remotes/run
index 19c6375..d0efe53 100755
--- a/abs/core/runit-scripts/runitscripts/services/remotes/run
+++ b/abs/core/runit-scripts/runitscripts/services/remotes/run
@@ -7,6 +7,23 @@ 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
+
+
+SETSERIAL="/usr/bin/setserial"
+
 if [ -f $LOG ]
 then
     rm -f $LOG
@@ -73,15 +90,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 +107,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 +124,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 +132,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 +140,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 +189,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 +228,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