eventlircd: updated lircd_helper patch .config/lircd.conf should always take precedence

This commit is contained in:
jenkins 2013-05-26 20:15:08 +03:00 committed by Stefan Saraev
parent 8a3e36027a
commit 47ea136e37

View File

@ -2,15 +2,17 @@ diff --git a/udev/lircd_helper.in b/udev/lircd_helper.in
index f580cc6..d4d7f3f 100644
--- a/udev/lircd_helper.in
+++ b/udev/lircd_helper.in
@@ -41,7 +41,11 @@ case "${ACTION}" in
@@ -41,7 +41,13 @@
daemon="${daemon} --uinput"
daemon="${daemon} --output=@localstatedir@/run/lirc/lircd-${devname_instance}"
daemon="${daemon} --pidfile=@localstatedir@/run/lirc/lircd-${devname_instance}.pid"
- daemon="${daemon} ${lircd_conf}"
+ if test -e "/storage/.config/lircd.conf" ; then
+ daemon="${daemon} /storage/.config/lircd.conf"
+ else
+ elif test -e "${lircd_conf}" ; then
+ daemon="${daemon} ${lircd_conf}"
+ else
+ exit 1
+ fi
${daemon}
for devlink in ${DEVLINKS} ; do