diff options
author | James Meyer <james.meyer@operamail.com> | 2012-05-14 15:37:57 (GMT) |
---|---|---|
committer | James Meyer <james.meyer@operamail.com> | 2012-05-14 15:37:57 (GMT) |
commit | 1794f44249bf09a21eec438856c1e5513c42f0e3 (patch) | |
tree | 3121d97cbf55ec0766c8ead1a9794bccca59df50 /abs/core/LinHES-config/mv_advanced.py | |
parent | 3137b6442dc47d14419bedd18e19d8fca2dd446c (diff) | |
download | linhes_pkgbuild-1794f44249bf09a21eec438856c1e5513c42f0e3.zip linhes_pkgbuild-1794f44249bf09a21eec438856c1e5513c42f0e3.tar.gz linhes_pkgbuild-1794f44249bf09a21eec438856c1e5513c42f0e3.tar.bz2 |
LinHES-config: fix ncid setup. Previously it was possible for the client install to remove the server install and vice versa.
Diffstat (limited to 'abs/core/LinHES-config/mv_advanced.py')
-rwxr-xr-x | abs/core/LinHES-config/mv_advanced.py | 15 |
1 files changed, 7 insertions, 8 deletions
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": |