From ce0b0a2b83bd35b8fb4b3eb0613708ceafab3e0b Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Mon, 2 Jan 2012 22:09:26 +0000 Subject: [PATCH] * ./bootstrap: - Change: In coriolis2.sh, cannot reliably determine the path to a sourced script under bash. Hardwire the location to /soc/coriolis2. --- bootstrap/coriolis2.sh | 3 ++- bootstrap/coriolisEnv.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bootstrap/coriolis2.sh b/bootstrap/coriolis2.sh index 7997da6c..05ae5edb 100644 --- a/bootstrap/coriolis2.sh +++ b/bootstrap/coriolis2.sh @@ -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 diff --git a/bootstrap/coriolisEnv.py b/bootstrap/coriolisEnv.py index dcfb6824..f176c40c 100755 --- a/bootstrap/coriolisEnv.py +++ b/bootstrap/coriolisEnv.py @@ -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.*")