diff --git a/packages/sysutils/lcdproc/config/lcd.conf b/packages/sysutils/lcdproc/config/lcd.conf deleted file mode 100644 index c75158e995..0000000000 --- a/packages/sysutils/lcdproc/config/lcd.conf +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ -# lcd.conf - -# This configuration file allows you to enable a LCD/VFD driver - -# Valid options are "none" / "irtrans" - -# none: No LCD/VFD hardware is installed (default) -# irtrans: Use irtrans as LCD/VFD driver - -LCD_DRIVER="none" diff --git a/packages/sysutils/lcdproc/init.d/63_lcdproc b/packages/sysutils/lcdproc/init.d/63_lcdproc index 3c3e58658b..8e7faff21b 100644 --- a/packages/sysutils/lcdproc/init.d/63_lcdproc +++ b/packages/sysutils/lcdproc/init.d/63_lcdproc @@ -22,9 +22,11 @@ # # runlevels: openelec, textmode +OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml" + ( - if [ -f /storage/.config/lcd.conf ]; then - . /storage/.config/lcd.conf + if [ -f "$OPENELEC_SETTINGS" ]; then + LCD_DRIVER=`grep LCD_DRIVER $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` if [ ! "$LCD_DRIVER" = none ]; then diff --git a/packages/sysutils/lcdproc/install b/packages/sysutils/lcdproc/install index 637f53d7c4..1febb2e886 100755 --- a/packages/sysutils/lcdproc/install +++ b/packages/sysutils/lcdproc/install @@ -31,8 +31,5 @@ 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