From 8f505e4e0af760c8219964890b27c3c1646a6a3e Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Wed, 28 Apr 2010 20:42:40 +0200
Subject: [PATCH] lcdproc: - add user config file - rework the init script

---
 packages/sysutils/lcdproc/init.d/33_lcdproc | 9 ++++++---
 packages/sysutils/lcdproc/install           | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/sysutils/lcdproc/init.d/33_lcdproc b/packages/sysutils/lcdproc/init.d/33_lcdproc
index 119dbef8bc..a64dcfcb81 100755
--- a/packages/sysutils/lcdproc/init.d/33_lcdproc
+++ b/packages/sysutils/lcdproc/init.d/33_lcdproc
@@ -2,9 +2,12 @@
 #
 # runlevels: openelec, textmode
 
-(
+[ -f /storage/.config/lcd.conf ] && . /storage/.config/lcd.conf
+
+if [ ! "$LCD_DRIVER" = "none" -a -z "$LCD_DRIVER" ]; then
+
   progress "Starting LCD daemon"
 
-  LCDd -c /etc/LCDd.conf > /dev/null 2>&1
+  LCDd -c /etc/LCDd.conf -d $LCD_DRIVER > /dev/null 2>&1
 
-)&
+fi
\ No newline at end of file
diff --git a/packages/sysutils/lcdproc/install b/packages/sysutils/lcdproc/install
index 969d25da3c..d395d781a0 100755
--- a/packages/sysutils/lcdproc/install
+++ b/packages/sysutils/lcdproc/install
@@ -16,5 +16,8 @@ mkdir -p $INSTALL/usr/sbin
 mkdir -p $INSTALL/usr/lib/lcdproc
   cp $PKG_BUILD/server/drivers/*.so $INSTALL/usr/lib/lcdproc
 
+mkdir -p $INSTALL/usr/config
+  cp $PKG_DIR/config/lcd.conf $INSTALL/usr/config
+
 mkdir -p $INSTALL/etc
   cp $PKG_BUILD/LCDd.conf $INSTALL/etc