From 12571d1baece4040b16380b6c1cd596c40d78dbd Mon Sep 17 00:00:00 2001
From: prascle <prascle>
Date: Thu, 30 Nov 2006 14:19:45 +0000
Subject: [PATCH] PAL 14078

---
 bin/appliskel/runAppli | 9 ++-------
 bin/runSalome.py       | 9 +++++----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/bin/appliskel/runAppli b/bin/appliskel/runAppli
index e28e9c9d4..7693557c1 100755
--- a/bin/appliskel/runAppli
+++ b/bin/appliskel/runAppli
@@ -10,20 +10,15 @@ APPLI_HOME=`dirname $0`
 
 . ${HOME}/${APPLI}/envd ${HOME}/${APPLI}
 
-# --- define port for CORBA naming service
-
-. ${HOME}/${APPLI}/searchFreePort.sh
-searchFreePort
-
 # --- if mpi lam, start lam (seems safe to be done several times)
-#     arret manuel avec lamhalt
+#     (manual stop with lamhalt)
 
 if [ "$LAMBHOST" ]; then
   lamboot
 fi
 
 # --- run SALOME
-#    (default arguments defined in local salome.launch could be completed
+#    (default arguments defined in local SalomeApp.xml could be completed
 #     by arguments to this command)
 
 if [ $# -ne 0 ] ; then
diff --git a/bin/runSalome.py b/bin/runSalome.py
index 424c00e32..07d2623ce 100755
--- a/bin/runSalome.py
+++ b/bin/runSalome.py
@@ -865,7 +865,7 @@ def registerEnv(args, modules_list, modules_root_dir):
 
 # -----------------------------------------------------------------------------
 
-def searchFreePort(args, save_config=0):
+def searchFreePort(args, save_config=1):
     print "Searching for a free port for naming service:",
     NSPORT=2810
     limit=NSPORT
@@ -895,6 +895,7 @@ def searchFreePort(args, save_config=0):
             os.environ['OMNIORB_CONFIG'] = '%s/.omniORB_%s_%s.cfg'%(home, myhost, NSPORT)
             initref = "NameService=corbaname::%s:%s"%(myhost, NSPORT)
             os.environ['NSPORT'] = "%s"%(NSPORT)
+            os.environ['NSHOST'] = "%s"%(myhost)
             f = open(os.environ['OMNIORB_CONFIG'], "w")
             import CORBA
             if CORBA.ORB_ID == "omniORB4":
@@ -948,11 +949,11 @@ def main():
             sys.exit(0)
             pass
         pass
-    save_config = 0
+    save_config = 1
     import sys
     if len(sys.argv) > 1:
-        if sys.argv[1] == "--save-config":
-            save_config = 1
+        if sys.argv[1] == "--nosave-config":
+            save_config = 0
             sys.argv[1:2] = []
             pass
         pass
-- 
2.39.2