LinHES-config: fix ncid setup. Previously it was possible for the client install to remove the server install and vice versa.

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":