From 1cda835a482e8ab2d893d69bed8bf77117bfed6b Mon Sep 17 00:00:00 2001 From: Gabriel Gouvine Date: Sun, 3 May 2015 21:10:42 +0200 Subject: [PATCH] Detection of the install path for 64 bits distros using /usr/lib --- bootstrap/builder/Configuration.py | 3 ++- bootstrap/coriolisEnv.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bootstrap/builder/Configuration.py b/bootstrap/builder/Configuration.py index 070877f6..ca574de7 100644 --- a/bootstrap/builder/Configuration.py +++ b/bootstrap/builder/Configuration.py @@ -167,7 +167,8 @@ class Configuration ( object ): elif self._osFedora .match(lines[0]): self._osType = "Linux.fc" elif self._osLinux_64 .match(lines[0]): self._osType = "Linux.x86_64" - self._libSuffix = "64" + if os.path.exists("/usr/lib64/"): + self._libSuffix = "64" elif self._osLinux .match(lines[0]): self._osType = "Linux.i386" elif self._osDarwin .match(lines[0]): self._osType = "Darwin" elif self._osFreeBSD8x_amd64.match(lines[0]): diff --git a/bootstrap/coriolisEnv.py b/bootstrap/coriolisEnv.py index d3cefae1..5070dfa0 100755 --- a/bootstrap/coriolisEnv.py +++ b/bootstrap/coriolisEnv.py @@ -84,7 +84,8 @@ def guessOs (): libDir = "lib64" elif osLinux_64.match(lines[0]): osType = "Linux.x86_64" - libDir = "lib64" + if(os.path.exists("/usr/lib64/")): + libDir = "lib64" elif osLinux.match(lines[0]): osType = "Linux.i386" elif osFreeBSD8x_64.match(lines[0]):