summaryrefslogtreecommitdiffstats
path: root/abs/mv-core/runit-scripts-mv
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2008-12-01 01:03:58 (GMT)
committerJames Meyer <james.meyer@operamail.com>2008-12-01 01:03:58 (GMT)
commit32415a51c4d53d981cd17f06f18928cdc0a1cbc5 (patch)
tree32f509f06c9af7840c6ab5b082c6e330d061b47a /abs/mv-core/runit-scripts-mv
parent09c383a1b8e939938600ff1bc7f740a8393de5c3 (diff)
downloadlinhes_pkgbuild-32415a51c4d53d981cd17f06f18928cdc0a1cbc5.zip
linhes_pkgbuild-32415a51c4d53d981cd17f06f18928cdc0a1cbc5.tar.gz
linhes_pkgbuild-32415a51c4d53d981cd17f06f18928cdc0a1cbc5.tar.bz2
backport lircd fixes to MV
Diffstat (limited to 'abs/mv-core/runit-scripts-mv')
-rwxr-xr-xabs/mv-core/runit-scripts-mv/runit.install3
-rwxr-xr-xabs/mv-core/runit-scripts-mv/runitscripts/services/lircd/finish5
-rwxr-xr-xabs/mv-core/runit-scripts-mv/runitscripts/services/lircd/run12
3 files changed, 15 insertions, 5 deletions
diff --git a/abs/mv-core/runit-scripts-mv/runit.install b/abs/mv-core/runit-scripts-mv/runit.install
index 4652368..adaf5ed 100755
--- a/abs/mv-core/runit-scripts-mv/runit.install
+++ b/abs/mv-core/runit-scripts-mv/runit.install
@@ -23,8 +23,7 @@ fi
post_install () {
mkdir /var/service
- ln -s /etc/sv/tty* /var/service
- servicelist="acpid cron frontend lircd ntpd alsa-utils avahi dbus portmap sshd"
+ servicelist="acpid cron frontend lircd ntpd alsa-utils avahi dbus portmap sshd tty2 tty3"
for i in $servicelist
do
ln -s /etc/sv/$i /var/service/$i
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/finish b/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/finish
index bf6cb69..754bca1 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/finish
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/finish
@@ -1,13 +1,12 @@
#!/bin/bash
-killall -9 lircd
+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 `
if [ $numfiles -gt 3 ]
then
- rm -f /etc/sv/lircd/.runtime/*
- ls -la /etc/sv/lircd/.runtime/*
+ rm -f /etc/sv/lircd/.runtime/* 2>/dev/null
sv stop lircd
echo "lircd is not able to start, disabling it"
fi
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/run
index 4457b37..0adfdc1 100755
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/run
+++ b/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/run
@@ -2,6 +2,17 @@
exec 2>&1
run_lircd2=false
. /etc/systemconfig
+[ -e /etc/sv/lircd/.runtime ] || mkdir -p /etc/sv/lircd/.runtime
+
+function dvico_detect {
+
+
+ if [ x$Remotetype = "dvico" ]
+ then
+ DEVICE="/dev/usb/hiddev0"
+ fi
+}
+
function imon_detect {
if [ -e /dev/lirc_imon ]
then
@@ -27,6 +38,7 @@ case $ReceiverType in
DEVICE=`ls /dev/lirc[0-9] 2>/dev/null |sort |sed '/./,$!d'|head -n 1 `
imon_detect
+ dvico_detect
;;
esac