From 3d21206a233da5685ad4f80cdab7a2d88ce03225 Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Tue, 11 Oct 2011 10:23:04 +0000
Subject: [PATCH]   * ./bootstrap:     - Change: In coriolisEnv.py, take into
 account the SoC installation         configuration.

---
 bootstrap/coriolisEnv.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bootstrap/coriolisEnv.py b/bootstrap/coriolisEnv.py
index 6fe80114..8ebaaa45 100755
--- a/bootstrap/coriolisEnv.py
+++ b/bootstrap/coriolisEnv.py
@@ -140,12 +140,13 @@ fi
 
     buildDir  = buildType + "." + linkType
     scriptDir = os.path.dirname ( os.path.abspath(__file__) )
-   #print "echo %s;" % scriptDir
-    if scriptDir == "/etc/coriolis2":
+   #print "echo \"Script Location: %s\";" % scriptDir,
+    if scriptDir.startswith("/etc/coriolis2"):
       coriolisTop  = "/usr"
       sysconfDir   = scriptDir
       shellMessage = "Using system-wide Coriolis 2 (/usr)"
-    elif scriptDir.startswith("/users/outil/coriolis/coriolis-2.x/"):
+    elif     scriptDir.startswith("/users/outil/coriolis/coriolis-2.x/") \
+          or scriptDir.startswith("/soc/coriolis/"):
       coriolisTop  = "/soc/coriolis2"
       sysconfDir   = coriolisTop + "/etc/coriolis2"
       shellMessage = "Using SoC network-wide Coriolis 2 (/soc/coriolis2)"