From a45f0f0c4d24d6af14affd691c5b3b3e65df1b7d Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 20 Dec 2017 16:21:00 +0100 Subject: [PATCH] lirc: start only if /storage/.config/lircd.conf is present Signed-off-by: Matthias Reichl --- packages/sysutils/lirc/scripts/lircd_helper | 9 +-------- packages/sysutils/lirc/system.d/lircd-uinput.service | 2 +- packages/sysutils/lirc/system.d/lircd.service | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/packages/sysutils/lirc/scripts/lircd_helper b/packages/sysutils/lirc/scripts/lircd_helper index b65b85d250..6f5605e18b 100755 --- a/packages/sysutils/lirc/scripts/lircd_helper +++ b/packages/sysutils/lirc/scripts/lircd_helper @@ -21,11 +21,4 @@ if [ -e "/storage/.config/lirc_options.conf" ] ; then LIRCD_OPTIONS="-O /storage/.config/lirc_options.conf" fi -if [ -e "/storage/.config/lircd.conf" ] ; then - LIRCD_CONF="/storage/.config/lircd.conf" -else - LIRCD_CONF="/etc/lirc/lircd.conf" -fi - - -exec /usr/sbin/lircd $LIRCD_OPTIONS "$@" $LIRCD_CONF +exec /usr/sbin/lircd $LIRCD_OPTIONS "$@" /storage/.config/lircd.conf diff --git a/packages/sysutils/lirc/system.d/lircd-uinput.service b/packages/sysutils/lirc/system.d/lircd-uinput.service index a192032ac5..f73f893e7d 100644 --- a/packages/sysutils/lirc/system.d/lircd-uinput.service +++ b/packages/sysutils/lirc/system.d/lircd-uinput.service @@ -1,7 +1,7 @@ [Unit] Documentation=http://lirc.org/html/configure.html Description=Forward LIRC button presses as uinput events -ConditionPathExists=/storage/.cache/services/lircd.conf +ConditionPathExists=/storage/.config/lircd.conf After=lircd.service [Service] diff --git a/packages/sysutils/lirc/system.d/lircd.service b/packages/sysutils/lirc/system.d/lircd.service index 4c522177e3..534dcf73f7 100644 --- a/packages/sysutils/lirc/system.d/lircd.service +++ b/packages/sysutils/lirc/system.d/lircd.service @@ -1,7 +1,7 @@ [Unit] Documentation=http://lirc.org/html/configure.html Description=Flexible IR remote input/output application support -ConditionPathExists=/storage/.cache/services/lircd.conf +ConditionPathExists=/storage/.config/lircd.conf After=network.target [Service]