diff options
| author | Britney Fransen <brfransen@gmail.com> | 2012-05-16 16:18:34 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2012-05-16 16:18:34 (GMT) |
| commit | 71cfd1ae3aeeb1989869a0d8e948340602ef1c8e (patch) | |
| tree | d92ecb2affdae51e0c3dde00eb656c8a5db0e62e /abs/core/LinHES-config/mv_advanced.py | |
| parent | feb3eb587bc14cc4415aecdbe0d39feb86e0bb9d (diff) | |
| parent | d11edcfd208c6ee48819b565c9dbd620e9c83781 (diff) | |
| download | linhes_pkgbuild-71cfd1ae3aeeb1989869a0d8e948340602ef1c8e.zip linhes_pkgbuild-71cfd1ae3aeeb1989869a0d8e948340602ef1c8e.tar.gz linhes_pkgbuild-71cfd1ae3aeeb1989869a0d8e948340602ef1c8e.tar.bz2 | |
Merge branch 'testing' of linhes.org:linhes_pkgbuild into testing
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": |