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

* ./bootstrap: 

- Change: In coriolis2.sh, cannot reliably determine the path to a sourced
        script under bash. Hardwire the location to /soc/coriolis2.
This commit is contained in:
Jean-Paul Chaput 2012-01-02 22:09:26 +00:00
parent 81f3b2fa56
commit ce0b0a2b83
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bootstrap/coriolis2.sh
View File

@ -1,6 +1,7 @@
#!/bin/bash
scriptPath="$0"
#scriptPath="$BASH_ARGV[0]"
scriptPath="/soc/coriolis2/etc/coriolis2/coriolis2.sh"
if [ -h "${scriptPath}" ]; then
while [ -h "${scriptPath}" ]; do scriptPath=`readlink "${scriptPath}"`; done

2
bootstrap/coriolisEnv.py
View File

@ -33,7 +33,7 @@ def stripPath ( pathName ):
def guessOs ():
osSlsoc6x_64 = re.compile (".*Linux.*el6.*x86_64.*")
osSlsoc6x = re.compile (".*Linux.*el6.*")
osSlsoc6x = re.compile (".*Linux.*(el|slsoc)6.*")
osSLSoC5x_64 = re.compile (".*Linux.*el5.*x86_64.*")
osSLSoC5x = re.compile (".*Linux.*(el5|2.6.23.13.*SoC).*")
osLinux_64 = re.compile (".*Linux.*x86_64.*")