From 1db55b90810b80ae17e78a50988475267b6b7953 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 1 Mar 2009 15:16:23 -0600
Subject: change location of master user smb.conf file to
 /home/mythtv/templates/smb.conf

Give the user the ability to add custom shares by editing /home/mythtv/templates/user.shares
---
 abs/core-testing/LinHES-config/PKGBUILD                          | 2 +-
 abs/core-testing/LinHES-config/systemconfig.sh                   | 5 +++--
 abs/core-testing/LinHES-config/templates/samba/smb.conf.template | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index cea9c1c..651e17a 100755
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=1.0
-pkgrel=290
+pkgrel=291
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev )
 pkgdesc="Install and configure your system"
 depends=(bc libstatgrab  mysql-python expect curl dnsutils parted sg3_utils nmbscan )
diff --git a/abs/core-testing/LinHES-config/systemconfig.sh b/abs/core-testing/LinHES-config/systemconfig.sh
index 6d63f5c..52b7ba3 100755
--- a/abs/core-testing/LinHES-config/systemconfig.sh
+++ b/abs/core-testing/LinHES-config/systemconfig.sh
@@ -15,6 +15,7 @@ BASE=""
 
 #TEMPLATES="/usr/share/templates"
 . /etc/profile
+MYTHHOME=$BASE/home/mythtv
 . $MV_ROOT/bin/networkconfig.sh
 PACMAN="pacman --noconfirm"
 postfix=`cat ${BASE}/usr/local/share/mythtv/.releasetype`
@@ -669,9 +670,9 @@ then
             mkdir ${BASE}/etc/samba
         fi
 
-        if [  -f ${BASE}/data/home/mythtv/templates/smb.conf  ]
+        if [  -f ${MYTHHOME}/templates/smb.conf  ]
         then
-            install -D -m755  ${BASE}/data/home/mythtv/templates/smb.conf   ${BASE}/etc/samba/smb.conf
+            install -D -m755  ${MYTHHOME}/templates/smb.conf   ${BASE}/etc/samba/smb.conf
         else
             sed -e "s/^.*workgroup =.*$/ workgroup = $Samba_domain/g " \
                 -e "s/^.*server string = .*$/ server string = $hostname/g" $TEMPLATES/samba/smb.conf.template > ${BASE}/etc/samba/smb.conf
diff --git a/abs/core-testing/LinHES-config/templates/samba/smb.conf.template b/abs/core-testing/LinHES-config/templates/samba/smb.conf.template
index 42ddb99..aef29eb 100644
--- a/abs/core-testing/LinHES-config/templates/samba/smb.conf.template
+++ b/abs/core-testing/LinHES-config/templates/samba/smb.conf.template
@@ -121,5 +121,5 @@
 
 
 #============================ Share Definitions ==============================
-
+include =  /home/mythtv/templates/user.shares
 
-- 
cgit v0.12