From 9b0f747ffb561a1823bd4795c6f22f2e2809e660 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Fri, 17 Jun 2005 11:31:15 +0000 Subject: [PATCH] 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 --- bacula/platforms/redhat/bacula-dir.in | 2 +- bacula/platforms/redhat/bacula-fd.in | 2 +- bacula/platforms/redhat/bacula-sd.in | 2 +- bacula/scripts/bacula.in | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bacula/platforms/redhat/bacula-dir.in b/bacula/platforms/redhat/bacula-dir.in index ec9992f773..93e8c211d8 100755 --- 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 9e72008324..aecbad6dbf 100755 --- 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 3bfd6ed021..2e9200bb4e 100755 --- 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 9697517383..2f215ae244 100755 --- 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 -- 2.39.5