From 12d658b1a7c47f803e9457481984e598fdf7ef78 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 15 Jun 2014 22:21:47 +0300 Subject: [PATCH] xbmc: merge tmpfiles --- .../xbmc/tmpfiles.d/z_90_xbmc.conf | 9 ++++++- .../xbmc/tmpfiles.d/z_92_xbmc-userdirs.conf | 24 ------------------- 2 files changed, 8 insertions(+), 25 deletions(-) delete mode 100644 packages/mediacenter/xbmc/tmpfiles.d/z_92_xbmc-userdirs.conf diff --git a/packages/mediacenter/xbmc/tmpfiles.d/z_90_xbmc.conf b/packages/mediacenter/xbmc/tmpfiles.d/z_90_xbmc.conf index 24bcf7a5b7..327ba7c74f 100644 --- a/packages/mediacenter/xbmc/tmpfiles.d/z_90_xbmc.conf +++ b/packages/mediacenter/xbmc/tmpfiles.d/z_90_xbmc.conf @@ -16,4 +16,11 @@ # along with OpenELEC. If not, see . ################################################################################ -d /run/xbmc 0755 root root - - +d /run/xbmc 0755 root root - - +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 - - + diff --git a/packages/mediacenter/xbmc/tmpfiles.d/z_92_xbmc-userdirs.conf b/packages/mediacenter/xbmc/tmpfiles.d/z_92_xbmc-userdirs.conf deleted file mode 100644 index 62552cdc49..0000000000 --- a/packages/mediacenter/xbmc/tmpfiles.d/z_92_xbmc-userdirs.conf +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC 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 of the License, or -# (at your option) any later version. -# -# OpenELEC 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. If not, see . -################################################################################ - -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 - -