From 398a33d9d2d8fe18e2872a27e95cafb7d9e1151a Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 18 Aug 2013 14:39:27 +0200
Subject: [PATCH] xbmc: rework debugconfig service files

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/mediacenter/xbmc/debug.d/xbmc.conf     | 1 +
 packages/mediacenter/xbmc/scripts/xbmc-config   | 6 +-----
 packages/mediacenter/xbmc/system.d/xbmc.service | 5 +++--
 3 files changed, 5 insertions(+), 7 deletions(-)
 create mode 100644 packages/mediacenter/xbmc/debug.d/xbmc.conf

diff --git a/packages/mediacenter/xbmc/debug.d/xbmc.conf b/packages/mediacenter/xbmc/debug.d/xbmc.conf
new file mode 100644
index 0000000000..7c6c362ac3
--- /dev/null
+++ b/packages/mediacenter/xbmc/debug.d/xbmc.conf
@@ -0,0 +1 @@
+XBMC_DEBUG="--debug"
diff --git a/packages/mediacenter/xbmc/scripts/xbmc-config b/packages/mediacenter/xbmc/scripts/xbmc-config
index 40bc985548..79c5468b5b 100755
--- a/packages/mediacenter/xbmc/scripts/xbmc-config
+++ b/packages/mediacenter/xbmc/scripts/xbmc-config
@@ -27,8 +27,4 @@ else
   XBMC_ARGS="--lircdev /var/run/lirc/lircd"
 fi
 
-if [ "$DEBUG" = yes ]; then
-  XBMC_ARGS="$XBMC_ARGS --debug"
-fi
-
-echo "XBMC_ARGS=\"$XBMC_ARGS\"" > /run/xbmc/xbmc.conf
+echo "XBMC_ARGS=\"$XBMC_ARGS\"" > /run/openelec/xbmc.conf
diff --git a/packages/mediacenter/xbmc/system.d/xbmc.service b/packages/mediacenter/xbmc/system.d/xbmc.service
index d965abdfde..aad3910b39 100644
--- a/packages/mediacenter/xbmc/system.d/xbmc.service
+++ b/packages/mediacenter/xbmc/system.d/xbmc.service
@@ -7,8 +7,9 @@ Requires=graphical.target
 Environment=DISPLAY=:0.0
 Environment=SDL_MOUSE_RELATIVE=0
 Environment=HOME=/storage
-EnvironmentFile=-/run/xbmc/xbmc.conf
-ExecStart=/usr/lib/xbmc/xbmc.bin --standalone -fs $XBMC_ARGS
+EnvironmentFile=-/run/openelec/xbmc.conf
+EnvironmentFile=-/run/openelec/debug/xbmc.conf
+ExecStart=/usr/lib/xbmc/xbmc.bin --standalone -fs $XBMC_ARGS $XBMC_DEBUG
 KillMode=process
 Restart=always