Allow use of /lib/tls on 2.6 kernels

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2135 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/platforms/redhat/bacula-dir.in b/bacula/platforms/redhat/bacula-dir.in
index ec9992f77366fa9c98316b743fe01c401dc699ec..93e8c211d8ed351b15eda70d54fb644b53af671f 100755 (executable)
--- a/bacula/platforms/redhat/bacula-dir.in
+++ b/bacula/platforms/redhat/bacula-dir.in
@@ -17,7 +17,7 @@ DIR_GROUP=@dir_group@
 OS=`uname -s`
 
 # if /lib/tls exists, force Bacula to use the glibc pthreads instead
-if [ -d "/lib/tls" -a $OS = "Linux" ] ; then
+if [ -d "/lib/tls" -a $OS = "Linux" -a `uname -r | cut -c1-3` = "2.4" ] ; then
      export LD_ASSUME_KERNEL=2.4.19
 fi
 RETVAL=0

diff --git a/bacula/platforms/redhat/bacula-fd.in b/bacula/platforms/redhat/bacula-fd.in
index 9e7200832495b66085d38eecf610cd997de7fbf8..aecbad6dbf0dbd8a117e61895aade85746e5030f 100755 (executable)
--- a/bacula/platforms/redhat/bacula-fd.in
+++ b/bacula/platforms/redhat/bacula-fd.in
@@ -17,7 +17,7 @@ FD_GROUP=@fd_group@
 OS=`uname -s`
 
 # if /lib/tls exists, force Bacula to use the glibc pthreads instead
-if [ -d "/lib/tls" -a $OS = "Linux" ] ; then
+if [ -d "/lib/tls" -a $OS = "Linux" -a `uname -r | cut -c1-3` = "2.4" ] ; then
      export LD_ASSUME_KERNEL=2.4.19
 fi
 RETVAL=0

diff --git a/bacula/platforms/redhat/bacula-sd.in b/bacula/platforms/redhat/bacula-sd.in
index 3bfd6ed02123ebd2154a8a7d66c019c02333e99f..2e9200bb4e046f76582c1abf3644a6c8944d1b1a 100755 (executable)
--- a/bacula/platforms/redhat/bacula-sd.in
+++ b/bacula/platforms/redhat/bacula-sd.in
@@ -17,7 +17,7 @@ SD_GROUP=@sd_group@
 OS=`uname -s`
 
 # if /lib/tls exists, force Bacula to use the glibc pthreads instead
-if [ -d "/lib/tls" -a $OS = "Linux" ] ; then
+if [ -d "/lib/tls" -a $OS = "Linux" -a `uname -r | cut -c1-3` = "2.4" ] ; then
      export LD_ASSUME_KERNEL=2.4.19
 fi
 RETVAL=0

diff --git a/bacula/scripts/bacula.in b/bacula/scripts/bacula.in
index 96975173839526ee952c9520aec0fe9a553f16df..2f215ae244dfeef38f2ff74a2135388533158876 100755 (executable)
--- a/bacula/scripts/bacula.in
+++ b/bacula/scripts/bacula.in
@@ -199,8 +199,8 @@ failure() {
 OS=`uname -s`
 
 # if /lib/tls exists, force Bacula to use the glibc pthreads instead
-if [ -d "/lib/tls" -a $OS = "Linux" ] ; then
-     export LD_ASSUME_KERNEL=2.4.19
+if [ -d "/lib/tls" -a $OS = "Linux" -a `uname -r | cut -c1-3` = "2.4" ] ; then
+   export LD_ASSUME_KERNEL=2.4.19
 fi
 
 case "$1" in