From aa74f2cfb3f029d18d4d97da4796d8a7cf4c16ab Mon Sep 17 00:00:00 2001
From: James Meyer <jams@linhes.org>
Date: Sun, 2 Jan 2011 23:03:08 +0000
Subject: runit-scripts: lirc: mkdir /var/run/lirc if not present switch
 location of lircd to /var/run/lirc/lircd  this is the new default.

---
 abs/core/runit-scripts/PKGBUILD                        |  2 +-
 abs/core/runit-scripts/runitscripts/services/lircd/run | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index 39368bb..6f1e24f 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=12
+pkgrel=14
 pkgdesc="collection of startup scripts for runit"
 url="http://smarden.org/runit/"
 license="BSD"
diff --git a/abs/core/runit-scripts/runitscripts/services/lircd/run b/abs/core/runit-scripts/runitscripts/services/lircd/run
index 3ff8af3..e0d468e 100755
--- a/abs/core/runit-scripts/runitscripts/services/lircd/run
+++ b/abs/core/runit-scripts/runitscripts/services/lircd/run
@@ -31,6 +31,7 @@ else
     stat_runit "Starting lirc"
 
     [ -e /etc/sv/lircd/.runtime ] || mkdir -p /etc/sv/lircd/.runtime
+    [ -e /var/run/lirc ] || mkdir -p /var/run/lirc
 
     function dvico_detect {
         if [ x$Remotetype = "xdvico" ] || [ x$Remotetype = "xDvico-Dual-Digital4-rev2" ]
@@ -108,7 +109,7 @@ else
 
         for i in `seq 1 $num_lirc`
         do
-            CMD="/usr/sbin/lircd -r -d /dev/lirc$i --output=/dev/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i"
+            CMD="/usr/sbin/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
             $CMD >>$LOG 2>>$LOG
@@ -119,9 +120,9 @@ else
         then
             if [ x$Remotetype = "xdvico" ]
             then
-                LCMD="/usr/sbin/lircd -r -n -d /dev/usb/dvicoIR --driver=dvico  --output /dev/lircd"
+                LCMD="/usr/sbin/lircd -r -n -d /dev/usb/dvicoIR --driver=dvico  --output /var/run/lirc/lircd"
             else
-                LCMD="/usr/sbin/lircd -r -n -d /dev/input/irremote --driver=devinput  --output /dev/lircd"
+                LCMD="/usr/sbin/lircd -r -n -d /dev/input/irremote --driver=devinput  --output /var/run/lirc/lircd"
             fi
 
             if [ $num_lirc -lt 0 ]
@@ -133,14 +134,14 @@ else
             elif [ $num_lirc -gt -1  ]
             then
                 i=$((i+1))
-                CMD="$LCMD --output=/dev/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i"
+                CMD="$LCMD --output=/var/run/lirc/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i"
                 $CMD >> $LOG
                 LASTCMD="--connect=localhost:876$i   $LASTCMD    "
                 printhl "   Device Dvico"
-                /usr/sbin/lircd -r -n -d /dev/lirc0 --output /dev/lircd  $LASTCMD  >>$LOG 2>>$LOG
+                /usr/sbin/lircd -r -n -d /dev/lirc0 --output /var/run/lirc/lircd  $LASTCMD  >>$LOG 2>>$LOG
             fi
         else
-            LCMD="/usr/sbin/lircd -r -n -d /dev/lirc0 --output /dev/lircd  $LASTCMD"
+            LCMD="/usr/sbin/lircd -r -n -d /dev/lirc0 --output /var/run/lirc/lircd  $LASTCMD"
             #echo $LCMD
             exec $LCMD >>$LOG 2>>$LOG
         fi
-- 
cgit v0.12

