From 63ea0f20bd093ff088eaf872f09380ced298877a Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 21 Sep 2011 09:53:18 +0200
Subject: [PATCH] xbmc: store default advancedsettings.xml in read only area,
 can still be overwritten by user advancedsettings.xml, dont create user
 advancedsettings.xml on first boot, disable DDS for now per default, because
 jpeg refactoring seems a lot faster and DDS is maybe not more needed (at
 least to save space). DDS can still be enabled in user advancedsettings.xml
 from user

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../mediacenter/xbmc/config/advancedsettings.xml  |  9 +++++++++
 packages/mediacenter/xbmc/init.d/92_setup-xbmc    | 15 ---------------
 packages/mediacenter/xbmc/install                 |  3 +++
 3 files changed, 12 insertions(+), 15 deletions(-)
 create mode 100644 packages/mediacenter/xbmc/config/advancedsettings.xml

diff --git a/packages/mediacenter/xbmc/config/advancedsettings.xml b/packages/mediacenter/xbmc/config/advancedsettings.xml
new file mode 100644
index 0000000000..67bd7e9355
--- /dev/null
+++ b/packages/mediacenter/xbmc/config/advancedsettings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<advancedsettings>
+  <splash>false</splash>
+  <cputempcommand>cputemp</cputempcommand>
+  <gputempcommand>gputemp</gputempcommand>
+  <samba>
+    <clienttimeout>30</clienttimeout>
+  </samba>
+</advancedsettings>
diff --git a/packages/mediacenter/xbmc/init.d/92_setup-xbmc b/packages/mediacenter/xbmc/init.d/92_setup-xbmc
index 1344840f82..dc1ce42edb 100644
--- a/packages/mediacenter/xbmc/init.d/92_setup-xbmc
+++ b/packages/mediacenter/xbmc/init.d/92_setup-xbmc
@@ -34,21 +34,6 @@ progress "setup XBMC"
 #
   mkdir -p $HOME/.xbmc/userdata
 
-# use dds fanarts by default
-  if [ ! -f $HOME/.xbmc/userdata/advancedsettings.xml ] ; then
-    cat > $HOME/.xbmc/userdata/advancedsettings.xml << EOF
-<advancedsettings>
-  <useddsfanart>true</useddsfanart>
-  <splash>false</splash>
-  <cputempcommand>cputemp</cputempcommand>
-  <gputempcommand>gputemp</gputempcommand>
-  <samba>
-    <clienttimeout>30</clienttimeout>
-  </samba>
-</advancedsettings>
-EOF
-  fi
-
 #
 # setup directories for XBMC sources
 #
diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install
index fcfb59bd33..8cf648236b 100755
--- a/packages/mediacenter/xbmc/install
+++ b/packages/mediacenter/xbmc/install
@@ -61,6 +61,9 @@ mkdir -p $INSTALL/usr/share/xbmc/media
          $INSTALL/usr/share/xbmc/addons/script.module.pil/lib/PIL
   rm -rf $INSTALL/usr/share/xbmc/addons/script.module.pysqlite
 
+mkdir -p $INSTALL/usr/share/xbmc/system/
+  cp $PKG_DIR/config/advancedsettings.xml $INSTALL/usr/share/xbmc/system/
+
 mkdir -p $INSTALL/usr/share/xbmc/addons
   cp -R $PKG_DIR/config/os.openelec.tv $INSTALL/usr/share/xbmc/addons
   $SED "s|@ADDON_OS_VERSION@|$OS_VERSION|g" -i $INSTALL/usr/share/xbmc/addons/os.openelec.tv/addon.xml