* ./bootstrap:
- Change: In coriolisEnv.py, take into account the SoC installation configuration.
This commit is contained in:
parent
0ec480cc0c
commit
3d21206a23
|
@ -140,12 +140,13 @@ fi
|
||||||
|
|
||||||
buildDir = buildType + "." + linkType
|
buildDir = buildType + "." + linkType
|
||||||
scriptDir = os.path.dirname ( os.path.abspath(__file__) )
|
scriptDir = os.path.dirname ( os.path.abspath(__file__) )
|
||||||
#print "echo %s;" % scriptDir
|
#print "echo \"Script Location: %s\";" % scriptDir,
|
||||||
if scriptDir == "/etc/coriolis2":
|
if scriptDir.startswith("/etc/coriolis2"):
|
||||||
coriolisTop = "/usr"
|
coriolisTop = "/usr"
|
||||||
sysconfDir = scriptDir
|
sysconfDir = scriptDir
|
||||||
shellMessage = "Using system-wide Coriolis 2 (/usr)"
|
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"
|
coriolisTop = "/soc/coriolis2"
|
||||||
sysconfDir = coriolisTop + "/etc/coriolis2"
|
sysconfDir = coriolisTop + "/etc/coriolis2"
|
||||||
shellMessage = "Using SoC network-wide Coriolis 2 (/soc/coriolis2)"
|
shellMessage = "Using SoC network-wide Coriolis 2 (/soc/coriolis2)"
|
||||||
|
|
Loading…
Reference in New Issue