From a4f1c5d120a08153dcf548606e5796f39c1ef385 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sat, 13 Jul 2013 00:57:15 +0200
Subject: [PATCH] xbmc: add tmpfiles.d support

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../mediacenter/xbmc/init.d/92_setup-xbmc     | 18 +------------
 .../xbmc/tmpfiles.d/92_xbmc_user_dirs.conf    | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+), 17 deletions(-)
 create mode 100644 packages/mediacenter/xbmc/tmpfiles.d/92_xbmc_user_dirs.conf

diff --git a/packages/mediacenter/xbmc/init.d/92_setup-xbmc b/packages/mediacenter/xbmc/init.d/92_setup-xbmc
index 2af3d091c5..597d370dc2 100644
--- a/packages/mediacenter/xbmc/init.d/92_setup-xbmc
+++ b/packages/mediacenter/xbmc/init.d/92_setup-xbmc
@@ -25,20 +25,8 @@
 progress "setup XBMC"
 
 #
-# add some default settings
+# setup XBMC sources
 #
-  mkdir -p $HOME/.xbmc/userdata
-
-#
-# setup directories for XBMC sources
-#
-
-  [ ! -d "$HOME/music" ] && mkdir -p $HOME/music
-  [ ! -d "$HOME/pictures" ] && mkdir -p $HOME/pictures
-  [ ! -d "$HOME/tvshows" ] && mkdir -p $HOME/tvshows
-  [ ! -d "$HOME/videos" ] && mkdir -p $HOME/videos
-
-  mkdir -p $HOME/.xbmc/userdata
 
   if [ ! -f $HOME/.xbmc/userdata/sources.xml ]; then
     if [ -f /usr/share/xbmc/config/sources.xml ]; then
@@ -81,10 +69,6 @@ EOF
 # common setup guisettings
 #
 
-  mkdir -p $HOME/.xbmc/userdata
-
-  [ ! -d "$HOME/screenshots" ] && mkdir -p $HOME/screenshots
-
   if [ ! -f $HOME/.xbmc/userdata/guisettings.xml ] ; then
     echo "<settings>" > $HOME/.xbmc/userdata/guisettings.xml
 
diff --git a/packages/mediacenter/xbmc/tmpfiles.d/92_xbmc_user_dirs.conf b/packages/mediacenter/xbmc/tmpfiles.d/92_xbmc_user_dirs.conf
new file mode 100644
index 0000000000..9b362b5ca3
--- /dev/null
+++ b/packages/mediacenter/xbmc/tmpfiles.d/92_xbmc_user_dirs.conf
@@ -0,0 +1,26 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+d    /storage/.xbmc/userdata     0755 root root - -
+d    /storage/music              0755 root root - -
+d    /storage/pictures           0755 root root - -
+d    /storage/tvshows            0755 root root - -
+d    /storage/videos             0755 root root - -
+d    /storage/screenshots        0755 root root - -