From 47ea136e37e8881f684aca4f2c530b0946953a33 Mon Sep 17 00:00:00 2001 From: jenkins Date: Sun, 26 May 2013 20:15:08 +0300 Subject: [PATCH] eventlircd: updated lircd_helper patch .config/lircd.conf should always take precedence --- .../patches/eventlircd-42-002-custom_config.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/remote/eventlircd/patches/eventlircd-42-002-custom_config.patch b/packages/sysutils/remote/eventlircd/patches/eventlircd-42-002-custom_config.patch index 9412adce48..7b1f89cbfd 100644 --- a/packages/sysutils/remote/eventlircd/patches/eventlircd-42-002-custom_config.patch +++ b/packages/sysutils/remote/eventlircd/patches/eventlircd-42-002-custom_config.patch @@ -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