LinHES-config: removed evrouter, ldm replaced with udevil

refs #883

3 files changed, 15 insertions, 15 deletions

diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 2939f3d..885045f 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,12 +1,12 @@
 pkgname=LinHES-config
 pkgver=2.3
-pkgrel=197
+pkgrel=199
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
 pkgdesc="Install and configure your system"
 depends=('bc' 'libstatgrab'  'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
 	 'sg3_utils' 'nmbscan' 'system-templates' 'rsync' 'python-parted'
 	 'python-pexpect' 'python-netifaces'
-	 'python-iplib' 'mythinstall>=2-10' 'sudo' 'setserial' 'ldm')
+	 'python-iplib' 'mythinstall>=2-10' 'sudo' 'setserial' 'udevil')
 #LinHES-timezone
 arch=('i686' 'x86_64')
 
@@ -151,7 +151,7 @@ md5sums=('26e20dba8d1bea96a07131ef945fd2f7'
          '9151c74fcaf18ec4cf5e757cfdbc7017'
          '3d1e4a119f38cff0498bf8a67e94e4b3'
          '71fd2d0d448fc2fcd15415a1beed7109'
-         'af6b3c5ec0d974b3e19ff1ed50662ee5'
+         'c0549457750c4f8e8038d904a0f3012a'
          '3d1e3c7315881a109fb089a540d2262c'
          'b845de3e05c1734cce4b9ac5e8f1baaf'
          'f5b2f4ed26a3099e66163040811ea2bd'
@@ -161,7 +161,7 @@ md5sums=('26e20dba8d1bea96a07131ef945fd2f7'
          'fe5e31b833cc6707209e9d656b6eb53c'
          'a1dab8e26e8cbc326b8c1a0794bc25d8'
          '087a0ef743bc8af915503f8773536ce4'
-         '61373f8826f49c1e09d90355e4df98dc'
+         '183a11aa06d60065106472ed9f72cc4a'
          'b4900090d841d3e390cb840cf16afd85'
          'f2a19e3e864984ec95ac5ea090cbfa69'
          'cf51cb22e23218ae7e9b55cac1ba3a7f'
diff --git a/abs/core/LinHES-config/mv_advanced.py b/abs/core/LinHES-config/mv_advanced.py
index 8ed216e..de10d78 100755
--- a/abs/core/LinHES-config/mv_advanced.py
+++ b/abs/core/LinHES-config/mv_advanced.py
@@ -275,9 +275,9 @@ def setup_advanced(systemconfig,data_config):
     #if data_config.SYSTEMTYPE == "LinHES":
         #setup_rrd(systemconfig.get("UseRRD"))
 
-    setup_evrouter(systemconfig.get("UseEvrouter"),
-                systemconfig.get("EvrouterConfig"),
-                systemconfig.get("TEMPLATES"))
+    #setup_evrouter(systemconfig.get("UseEvrouter"),
+                #systemconfig.get("EvrouterConfig"),
+                #systemconfig.get("TEMPLATES"))
 
     setup_DNSmasq(systemconfig.get("RunDHCP"),
                 systemconfig.get("mythip"),
diff --git a/abs/core/LinHES-config/mv_hostype.py b/abs/core/LinHES-config/mv_hostype.py
index d29ddee..ba9551f 100755
--- a/abs/core/LinHES-config/mv_hostype.py
+++ b/abs/core/LinHES-config/mv_hostype.py
@@ -248,8 +248,8 @@ def hostypeprint(systemconfig):
             restart_mbe = True
 
 
-        install_list=["nss-mdns", "mysql", "mythdb-initial", "avahi", "rpcbind", "nfs-utils", "local-website", "myth2ipod", "mythtv-status" , "ldm"]
-        daemon_list=["mysql", "mythbackend", "avahi", "rpcbind", "nfs-common", "netfs", "lighttpd" ,"msg_daemon", "ldm"]
+        install_list=["nss-mdns", "mysql", "mythdb-initial", "avahi", "rpcbind", "nfs-utils", "local-website", "myth2ipod", "mythtv-status" , "udevil"]
+        daemon_list=["mysql", "mythbackend", "avahi", "rpcbind", "nfs-common", "netfs", "lighttpd" ,"msg_daemon", "udevil"]
 
 
         mv_common.link_file(myth_status,profile_status)
@@ -265,8 +265,8 @@ def hostypeprint(systemconfig):
         logging.info("Master backend system being configured")
         setup_ntp(False,"null")
         setup_avahi(systemconfig.get("TEMPLATES"))
-        install_list=["nss-mdns", "mysql", "mythdb-initial", "avahi", "rpcbind", "nfs-utils", "local-website", "myth2ipod", "mythtv-status" ,"ldm"]
-        daemon_list=["mysql", "mythbackend", "avahi", "rpcbind", "nfs-common", "netfs", "lighttpd" ,"msg_daemon" ,"ldm" ]
+        install_list=["nss-mdns", "mysql", "mythdb-initial", "avahi", "rpcbind", "nfs-utils", "local-website", "myth2ipod", "mythtv-status" ,"udevil"]
+        daemon_list=["mysql", "mythbackend", "avahi", "rpcbind", "nfs-common", "netfs", "lighttpd" ,"msg_daemon" ,"udevil" ]
         EnableNetwork = True
         run_mysqlnetwork = True
         mv_common.link_file(myth_status,profile_status)
@@ -289,8 +289,8 @@ def hostypeprint(systemconfig):
         remove_avahi_service()
         mv_common.link_file(myth_status,profile_status)
 
-        install_list = [ "nss-mdns", "rpcbind", "nfs-utils", "avahi", "libmysqlclient","ldm","supplemental-web-slave"]
-        daemon_list = ["mythbackend", "rpcbind", "nfs-common", "netfs", "avahi" ,"msg_daemon","ldm","supplemental-slave" ]
+        install_list = [ "nss-mdns", "rpcbind", "nfs-utils", "avahi", "libmysqlclient","udevil","supplemental-web-slave"]
+        daemon_list = ["mythbackend", "rpcbind", "nfs-common", "netfs", "avahi" ,"msg_daemon","udevil","supplemental-slave" ]
 
         daemon_remove_list=["mysql", "lighttpd", "certmaster"]
 
@@ -312,10 +312,10 @@ def hostypeprint(systemconfig):
         logging.info("Frontend only system being configured")
         setup_ntp(True,systemconfig.get("dbhost"))
         remove_avahi_service()
-        install_list=["mysql-clients", "libmysqlclient",  "avahi", "rpcbind", "nfs-utils","ldm"]
+        install_list=["mysql-clients", "libmysqlclient",  "avahi", "rpcbind", "nfs-utils","udevil"]
         remove_list=["mysql","lighttpd"]
 
-        daemon_list=["nss-mdns",  "mysql", "mythbackend", "avahi", "rpcbind", "nfs-common", "netfs" ,"msg_daemon","ldm"]
+        daemon_list=["nss-mdns",  "mysql", "mythbackend", "avahi", "rpcbind", "nfs-common", "netfs" ,"msg_daemon","udevil"]
         daemon_remove_list=["mysql", "mythbackend","lighttpd"]
         if xymon_supported:
             install_list.append('xymonclient')