diff options
| -rwxr-xr-x | abs/core-testing/LinHES-config/PKGBUILD | 2 | ||||
| -rwxr-xr-x | abs/core-testing/LinHES-config/systemconfig.sh | 5 | ||||
| -rw-r--r-- | 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 |