From 5759631b138bbee8817dc192d3629fa4bf116e5a Mon Sep 17 00:00:00 2001 From: James Meyer Date: Thu, 20 Oct 2011 12:42:11 -0500 Subject: runit-scripts: LIRC add call to in_kernel_support --- abs/core/runit-scripts/PKGBUILD | 2 +- .../runit-scripts/runitscripts/services/lircd/finish | 17 ++++++++++++----- abs/core/runit-scripts/runitscripts/services/lircd/run | 17 ++++++++++++++--- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index c505356..bae19e3 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=34 +pkgrel=37 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/core/runit-scripts/runitscripts/services/lircd/finish b/abs/core/runit-scripts/runitscripts/services/lircd/finish index 1afc41c..f6d8b95 100755 --- a/abs/core/runit-scripts/runitscripts/services/lircd/finish +++ b/abs/core/runit-scripts/runitscripts/services/lircd/finish @@ -2,15 +2,22 @@ export TERM=linux . /etc/rc.conf . /etc/rc.d/functions +. /usr/MythVantage/bin/install_functions.sh -killall -9 lircd 2>/dev/null -rm -f /var/run/lirc*.pid +killall -9 lircd 2>/dev/null +rm -f /var/run/lirc*.pid [ -e /etc/sv/lircd/.runtime ] || mkdir -p /etc/sv/lircd/.runtime -touch /etc/sv/lircd/.runtime/`date +%s` -numfiles=`/usr/bin/file_time_offset.py -s4 -d/etc/sv/lircd/.runtime ` +touch /etc/sv/lircd/.runtime/`date +%s` +numfiles=`/usr/bin/file_time_offset.py -s4 -d/etc/sv/lircd/.runtime ` if [ $numfiles -gt 3 ] then rm -f /etc/sv/lircd/.runtime/* 2>/dev/null sv stop lircd printhl " lircd is not able to start, disabling it" -fi +fi + + + + + + in_kernel_support "enable" \ No newline at end of file diff --git a/abs/core/runit-scripts/runitscripts/services/lircd/run b/abs/core/runit-scripts/runitscripts/services/lircd/run index 966b980..b23e348 100755 --- a/abs/core/runit-scripts/runitscripts/services/lircd/run +++ b/abs/core/runit-scripts/runitscripts/services/lircd/run @@ -5,7 +5,7 @@ export TERM=linux . /etc/rc.conf . /etc/rc.d/functions - +. /usr/MythVantage/bin/install_functions.sh LOG=/tmp/lirc.log @@ -14,9 +14,16 @@ then rm -f $LOG fi + + + + + + + #since what we do may not be enough #if your one of those people, this is where you place your stuff -#This means place your lirc stuff in /etc/runit/lirc.sh. +#This means place your lirc stuff in /etc/runit/lirc.sh. #Anything in that file will be used and the rest of this file is ignored if [ -f /etc/runit/lirc.sh ] @@ -24,12 +31,16 @@ then #program must not terminate. stat_runit "Starting lirc" - + /etc/runit/lirc.sh else . /etc/systemconfig stat_runit "Starting lirc" + + in_kernel_support "disable" + + #enable lirc bridge protocol printhl " lirc: ir-keytable" /usr/bin/ir-keytable -p lirc > /dev/null 2>/dev/null -- cgit v0.12