From e4cee7c88fb977cf4fe1ac18d47974c2c6c71622 Mon Sep 17 00:00:00 2001 From: jenkins101 Date: Fri, 2 May 2014 12:19:57 +0200 Subject: [PATCH] lircd_helper: lircd needs to start if there is a .config/lircd.conf else we need every working remote in udev, 98-lircd.rules. I dont think we want to maintane this. :-) Signed-off-by: Stephan Raue --- .../sysutils/remote/lirc/scripts/lircd_helper | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/sysutils/remote/lirc/scripts/lircd_helper b/packages/sysutils/remote/lirc/scripts/lircd_helper index 95341a8b18..bd7db68b74 100755 --- a/packages/sysutils/remote/lirc/scripts/lircd_helper +++ b/packages/sysutils/remote/lirc/scripts/lircd_helper @@ -27,9 +27,6 @@ case "$ACTION" in if [ "x$DRIVER" = "x" ]; then exit 1; fi - if [ "x$CONFIG" = "x" ]; then - exit 1; - fi mkdir -p '/run/lirc' @@ -40,12 +37,16 @@ case "$ACTION" in LIRCD_CONFIG="$LIRCD_CONFIG --output=/run/lirc/lircd-$DEVICE" LIRCD_CONFIG="$LIRCD_CONFIG --pidfile=/run/lirc/lircd-$DEVICE.pid" - if [ -e "/storage/.config/$CONFIG" ]; then - LIRCD_CONFIG="$LIRCD_CONFIG /storage/.config/$CONFIG" - elif [ -e "/storage/.config/lircd.conf" ]; then + if [ -e "/storage/.config/lircd.conf" ]; then LIRCD_CONFIG="$LIRCD_CONFIG /storage/.config/lircd.conf" - elif [ -e "/etc/lirc/$CONFIG" ]; then - LIRCD_CONFIG="$LIRCD_CONFIG /etc/lirc/$CONFIG" + elif [ -n "$CONFIG" ]; then + if [ -e "/storage/.config/$CONFIG" ]; then + LIRCD_CONFIG="$LIRCD_CONFIG /storage/.config/$CONFIG" + elif [ -e "/etc/lirc/$CONFIG" ]; then + LIRCD_CONFIG="$LIRCD_CONFIG /etc/lirc/$CONFIG" + else + exit 1 + fi else exit 1 fi