From af89ea5020456829c8850ab29048d7a73c141195 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Thu, 25 Mar 2010 10:37:45 +0100
Subject: [PATCH] lirc: - move /etc/conf.d/* to /etc/lirc.conf - rename
 packages/sysutils/lirc/config/sysconfig_$RECEIVER to
 packages/sysutils/lirc/config/config_$RECEIVER

---
 .../sysutils/lirc/config/{sysconfig_mceusb => config_mceusb}  | 0
 packages/sysutils/lirc/init.d/32_lirc                         | 2 ++
 packages/sysutils/lirc/install                                | 4 +---
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename packages/sysutils/lirc/config/{sysconfig_mceusb => config_mceusb} (100%)

diff --git a/packages/sysutils/lirc/config/sysconfig_mceusb b/packages/sysutils/lirc/config/config_mceusb
similarity index 100%
rename from packages/sysutils/lirc/config/sysconfig_mceusb
rename to packages/sysutils/lirc/config/config_mceusb
diff --git a/packages/sysutils/lirc/init.d/32_lirc b/packages/sysutils/lirc/init.d/32_lirc
index 2b4c25f9fb..9aa4a83b50 100755
--- a/packages/sysutils/lirc/init.d/32_lirc
+++ b/packages/sysutils/lirc/init.d/32_lirc
@@ -5,6 +5,8 @@
 (
   progress "Starting LIRC daemon"
 
+  . /etc/lirc.conf
+
   $IONICE mkdir -p /var/run/lirc
     lircd --driver=$LIRC_DRIVER --device=$LIRC_DEVICE --output=$LIRC_OUTPUT
 )&
diff --git a/packages/sysutils/lirc/install b/packages/sysutils/lirc/install
index bb56ffc3b8..caf1b9868a 100755
--- a/packages/sysutils/lirc/install
+++ b/packages/sysutils/lirc/install
@@ -16,9 +16,7 @@ mkdir -p $INSTALL/usr/bin
 
 mkdir -p $INSTALL/etc
   cp $PKG_DIR/config/lircd_$REMOTE.conf $INSTALL/etc/lircd.conf
-
-mkdir -p $INSTALL/etc/conf.d
-  cp $PKG_DIR/config/sysconfig_$RECEIVER $INSTALL/etc/conf.d/lirc
+  cp $PKG_DIR/config/config_$RECEIVER $INSTALL/etc/lirc.conf
 
 mkdir -p $INSTALL/lib/modules/$VER/lirc
   cp $PKG_BUILD/drivers/*/*.ko $INSTALL/lib/modules/$VER/lirc