jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* ./bootstrap: 

- Change: In coriolisEnv.py, take into account the SoC installation
        configuration.
This commit is contained in:
Jean-Paul Chaput 2011-10-11 10:23:04 +00:00
parent 0ec480cc0c
commit 3d21206a23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bootstrap/coriolisEnv.py
View File

@ -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)"