From d7882cc0b76c9c76e170cd7db7d3a2c6b8baedab Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Wed, 6 May 2009 16:36:34 -0500
Subject: LinHES-config: fix package names nfs-utils avahi & mythmovies

---
 abs/core-testing/LinHES-config/PKGBUILD        |  4 ++--
 abs/core-testing/LinHES-config/systemconfig.sh | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index 1d01ca5..c035c80 100644
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,9 +1,9 @@
 pkgname=LinHES-config
 pkgver=1.0
-pkgrel=398
+pkgrel=402
 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 system-templates )
+depends=(bc libstatgrab  mysql-python expect curl dnsutils parted sg3_utils nmbscan system-templates rsync )
 arch=('i686')
 
 source=(mythinstall.bin myth_user_call file_time_offset.py install-ui.xml install_proxy.sh install_functions.sh systemconfig.sh install_db_chroot.sh restore_default_settings.sh xconfig.sh timezip.py soundconfig.sh LinHES-release issue MythVantage.sh create_master.sh build_diskless.sh networkconfig.sh timezone.bin autocard.py restore_km_db_chroot.sh README ir_config.sh)
diff --git a/abs/core-testing/LinHES-config/systemconfig.sh b/abs/core-testing/LinHES-config/systemconfig.sh
index 6f8ceb8..54d3b01 100755
--- a/abs/core-testing/LinHES-config/systemconfig.sh
+++ b/abs/core-testing/LinHES-config/systemconfig.sh
@@ -297,7 +297,7 @@ function setupplugins (){
 pkglistinstall=""
 pkglistremove=""
 #default enabled
-for i in mythcontrols mythgallery mythmovietime mythmusic mythsmolt mythvideo
+for i in mythcontrols mythgallery mythmovies mythmusic mythsmolt mythvideo
 do
     eval pkgvalue=\$${i}
     if [ x$pkgvalue = x ]
@@ -607,7 +607,7 @@ fi
 if [ x$UseNFS = x1 ]
 then
     ser_install="nfs-utils portmap $ser_install"
-    ser_daemon_add="nfsd nfslock portmap $ser_daemon_add"
+    ser_daemon_add="nfsd nfs-utils portmap $ser_daemon_add"
     sed -e "s/REPLACEME/*/g" $TEMPLATES/exports.template > ${BASE}/etc/exports
 
 else
@@ -945,7 +945,7 @@ exit 0
 
 function setup_db (){
 
-            install="mysql avahli"
+            install="mysql avahi"
             daemon_add="mysql"
             packages
             daemons
@@ -1246,10 +1246,10 @@ then
                             sudo sv restart avahi
                 fi
 
-                install="mysql mythdb-initial  avahli portmap nfslock local-website $ser_install"
+                install="mysql mythdb-initial  avahi portmap nfs-utils local-website $ser_install"
                 remove="none $ser_remove"
 
-                daemon_add="mysql  mythbackend  avahi portmap nfslock netfs lighttpd $ser_daemon_add"
+                daemon_add="mysql  mythbackend  avahi portmap nfs-utils netfs lighttpd $ser_daemon_add"
                 daemon_remove="none $ser_daemon_remove"
 
                 ;;
@@ -1264,10 +1264,10 @@ then
                             sudo sv restart  avahi
                 fi
 
-                install="mysql  mythdb-initial avahi portmap nfslock local-website myth2ipod mythtv-status $ser_install  "
+                install="mysql  mythdb-initial avahi portmap nfs-utils local-website myth2ipod mythtv-status $ser_install  "
                 remove="$ser_remove"
 
-                daemon_add="mysql mythbackend  avahi   portmap nfslock netfs lighttpd $ser_daemon_add"
+                daemon_add="mysql mythbackend  avahi   portmap nfs-utils netfs lighttpd $ser_daemon_add"
                 daemon_remove="$ser_daemon_remove"
                 ;;
         Slave_backend)
@@ -1284,10 +1284,10 @@ then
                 fi
 
                 #cp $TEMPLATES/mysql.service  ${BASE}/etc/avahi/services/mysql.service
-                install="mysql  avahi  local-website portmap nfslock $ser_install  "
+                install="mysql  avahi  local-website portmap nfs-utils $ser_install  "
                 remove=" $ser_remove"
 
-                daemon_add="mythbackend avahi portmap nfslock netfs lighttpd $ser_daemon_add"
+                daemon_add="mythbackend avahi portmap nfs-utils netfs lighttpd $ser_daemon_add"
                 daemon_remove="$ser_daemon_remove"
                 ;;
         Frontend_only)
@@ -1300,10 +1300,10 @@ then
                             sudo sv restart  avahi
                 fi
 
-            install="libmysqlclient mysql-clients portmap nfslock avahi local-website $ser_install"
+            install="libmysqlclient mysql-clients portmap nfs-utils avahi local-website $ser_install"
             remove="mysql mythweb$postfix $ser_remove"
 
-            daemon_add="avahi portmap nfslock netfs lighttpd $ser_daemon_add "
+            daemon_add="avahi portmap nfs-utils netfs lighttpd $ser_daemon_add "
             daemon_remove="mysql   mythbackend  $ser_daemon_remove"
     ;;
     esac
-- 
cgit v0.12

