From 0343f1f8289e99d93e757133bbf95153e75d54b8 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 14 Feb 2011 12:07:42 +0100
Subject: [PATCH] samba: install the same config on system and user config dir

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../network/samba/config/samba.conf.sample    | 125 ------------------
 packages/network/samba/install                |   2 +-
 2 files changed, 1 insertion(+), 126 deletions(-)
 delete mode 100644 packages/network/samba/config/samba.conf.sample

diff --git a/packages/network/samba/config/samba.conf.sample b/packages/network/samba/config/samba.conf.sample
deleted file mode 100644
index 18585b0c95..0000000000
--- a/packages/network/samba/config/samba.conf.sample
+++ /dev/null
@@ -1,125 +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
-################################################################################
-# samba.conf
-
-# This configuration file allows you to customize the samba shares
-# available from your machine
-
-[global]
-  server string = Media Centre(%i)
-  workgroup = WORKGROUP
-  netbios name = openelec
-  security = share
-  guest account = root
-  socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
-  wins support = yes
-  syslog only = yes
-  name resolve order = lmhosts wins bcast host
-
-# Using the following configurations as a template allows you to add
-# writable shares of disks and paths under /storage
-
-[Update]
-  path = /storage/.update
-  available = yes
-  browsable = yes
-  public = yes
-  writable = yes
-  root preexec = mkdir -p /storage/.update
-
-[Videos]
-  path = /storage/videos
-  available = yes
-  browsable = yes
-  public = yes
-  writable = yes
-  root preexec = mkdir -p /storage/videos
-
-[Music]
-  path = /storage/music
-  available = yes
-  browsable = yes
-  public = yes
-  writable = yes
-  root preexec = mkdir -p /storage/music
-
-[TV Shows]
-  path = /storage/tvshows
-  available = yes
-  browsable = yes
-  public = yes
-  writable = yes
-  root preexec = mkdir -p /storage/tvshows
-
-[Downloads]
-  path = /storage/downloads
-  available = yes
-  browsable = yes
-  public = yes
-  writable = yes
-  root preexec = mkdir -p /storage/downloads
-
-[Pictures]
-  path = /storage/pictures
-  available = yes
-  browsable = yes
-  public = yes
-  writable = yes
-  root preexec = mkdir -p /storage/pictures
-
-[Emulators]
-  path = /storage/emulators/mame/roms
-  available = yes
-  browsable = yes
-  public = yes
-  writable = yes
-  root preexec = mkdir -p /storage/emulators/mame/roms
-
-[Configfiles]
-  path = /storage/.config
-  available = yes
-  browsable = yes
-  public = yes
-  writable = yes
-  root preexec = mkdir -p /storage/.config
-
-[Userdata]
-  path = /storage/.xbmc/userdata
-  available = yes
-  browsable = yes
-  public = yes
-  writable = yes
-  root preexec = mkdir -p /storage/.xbmc/userdata
-
-[Screenshots]
-  path = /storage/screenshots
-  available = yes
-  browsable = yes
-  public = yes
-  writable = yes
-  root preexec = mkdir -p /storage/screenshots
-
-[Logfiles]
-  path = /storage/logfiles
-  available = yes
-  browsable = yes
-  public = yes
-  writable = yes
-  root preexec = mkdir -p /storage/logfiles
diff --git a/packages/network/samba/install b/packages/network/samba/install
index 43445ec10f..fad9cc4479 100755
--- a/packages/network/samba/install
+++ b/packages/network/samba/install
@@ -40,7 +40,7 @@ if [ "$SAMBA_SERVER" = "yes" ]; then
     cp $PKG_DIR/config/smb.conf $INSTALL/etc/samba
 
   mkdir -p $INSTALL/usr/config
-    cp $PKG_DIR/config/samba.conf.sample $INSTALL/usr/config
+    cp $PKG_DIR/config/smb.conf $INSTALL/usr/config/samba.conf.sample
 
   mkdir -p $INSTALL/etc/init.d
     cp $PKG_DIR/scripts/* $INSTALL/etc/init.d