From 1794f44249bf09a21eec438856c1e5513c42f0e3 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Mon, 14 May 2012 10:37:57 -0500 Subject: LinHES-config: fix ncid setup. Previously it was possible for the client install to remove the server install and vice versa. --- abs/core/LinHES-config/PKGBUILD | 4 ++-- abs/core/LinHES-config/mv_advanced.py | 15 +++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index d30fc63..ad2e310 100644 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.3 -pkgrel=76 +pkgrel=77 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' @@ -127,7 +127,7 @@ md5sums=('18af4fe481e1fc2ae02050026eb5cd27' '9151c74fcaf18ec4cf5e757cfdbc7017' '3d1e4a119f38cff0498bf8a67e94e4b3' '71fd2d0d448fc2fcd15415a1beed7109' - 'b83072f08725f1216a4d31e02d60c5e5' + '61ccbf573ee196e3edf53a512820b431' 'e1715bbbabd42e7419755b09f60734aa' 'b845de3e05c1734cce4b9ac5e8f1baaf' '6801f87992b44118a12b6dfe6ea68127' diff --git a/abs/core/LinHES-config/mv_advanced.py b/abs/core/LinHES-config/mv_advanced.py index 7608604..fdcd1e2 100755 --- a/abs/core/LinHES-config/mv_advanced.py +++ b/abs/core/LinHES-config/mv_advanced.py @@ -34,7 +34,7 @@ def setup_pacman(create_link): else: logging.info(" Pacman link will not be created") return -def setup_ncid_client(runclient): +def setup_ncid_client(runclient,runserver): logging.debug(" Configuring ncid client") if runclient == "1" : mv_common.pacinstall("ncid") @@ -385,14 +385,13 @@ def setup_advanced(systemconfig,data_config): create_link = True setup_pacman(create_link) - setup_ncid_client(systemconfig.get("ncidclient")) - setup_ncid_daemon(systemconfig.get("Runncidd")) - #setup_ncid_client(systemconfig.get("dbhost"), - #systemconfig.get("TEMPLATES")+"/ncid.conf.template") - #setup_ncid_daemon(systemconfig.get("nciddSerialPort"), - #systemconfig.get("TEMPLATES")+"/ncidd.conf.template", - #systemconfig.get("Runncidd")) + + if (( systemconfig.get("SystemType") == "Standalone" ) or (systemconfig.get("SystemType") == "Master_backend" )) : + setup_ncid_daemon(systemconfig.get("Runncidd")) + + setup_ncid_client(systemconfig.get("ncidclient"),systemconfig.get("Runncidd")) + setup_splash(systemconfig.get("Usebootsplash")) if data_config.SYSTEMTYPE == "MythVantage": -- cgit v0.12