From 228c36f341c7f3fbdf8c226de7ac186bb3b969a2 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 16 Mar 2008 06:48:37 +0000
Subject: [PATCH] Tweaks

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6614 91ce42f0-d328-0410-95d8-f526ca767f89
---
 regress/scripts/get-os     | 51 ++++++++++++++++++++++----------------
 regress/tests/maxvol2-test |  2 +-
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/regress/scripts/get-os b/regress/scripts/get-os
index 8c818dce08..412c7e1976 100755
--- a/regress/scripts/get-os
+++ b/regress/scripts/get-os
@@ -339,72 +339,77 @@ fi
 # ----------------------------------------------------------
 if test "x$DISTNAME" != "x"
 then
-        echo "distname set to $DISTNAME"
+	echo "distname set to $DISTNAME"
 elif test $HAVE_UNAME=yes -a x`uname -s` = xOSF1
 then
-        DISTNAME=alpha
+	DISTNAME=alpha
 elif test $HAVE_UNAME=yes -a x`uname -s` = xAIX
 then
-        DISTNAME=aix
+	DISTNAME=aix
 elif test $HAVE_UNAME=yes -a x`uname -s` = xHP-UX
 then
-        DISTNAME=hpux
+	DISTNAME=hpux
 elif test $HAVE_UNAME=yes -a x`uname -s` = xSunOS
 then
-        DISTNAME=solaris
+	DISTNAME=solaris
 elif test $HAVE_UNAME=yes -a x`uname -s` = xFreeBSD
 then
-        DISTNAME=freebsd
+	DISTNAME=freebsd
 elif test $HAVE_UNAME=yes -a x`uname -s` = xNetBSD
 then
-        DISTNAME=netbsd
+	DISTNAME=netbsd
 elif test $HAVE_UNAME=yes -a x`uname -s` = xOpenBSD
 then
-        DISTNAME=openbsd
+	DISTNAME=openbsd
 elif test $HAVE_UNAME=yes -a x`uname -s` = xIRIX
 then
-        DISTNAME=irix
+	DISTNAME=irix
 elif test $HAVE_UNAME=yes -a x`uname -s` = xBSD/OS
 then
-        DISTNAME=bsdi
+	DISTNAME=bsdi
 elif test -f /etc/SuSE-release
 then
-        DISTNAME=suse
+	DISTNAME=suse
 elif test -d /etc/SuSEconfig
 then
-        DISTNAME=suse5
+	DISTNAME=suse5
 elif test -f /etc/mandrake-release
 then
-        DISTNAME=mandrake
+	DISTNAME=mandrake
 elif test -f /etc/fedora-release
 then
-        DISTNAME=fedora
+	DISTNAME=fedora
 elif test -f /etc/whitebox-release
 then
        DISTNAME=redhat
 elif test -f /etc/redhat-release
 then
-        DISTNAME=redhat
+       if test `grep CentOs /etc/redhat-release`
+       then
+	   DISTNAME=redhat
+       else
+	   DISTNAME=centos
+       fi
 elif test -f /etc/gentoo-release
 then
-        DISTNAME=gentoo
+	DISTNAME=gentoo
 elif test -f /etc/debian_version
 then
-        DISTNAME=debian
+	DISTNAME=debian
 elif test -f /etc/slackware-version
 then
-        DISTNAME=slackware
+	DISTNAME=slackware
 elif test $HAVE_UNAME=yes -a x`uname -s` = xDarwin
 then
     DISTNAME=darwin
 elif test -f /etc/engarde-version
 then
-        DISTNAME=engarde
+	DISTNAME=engarde
 elif test "$CYGWIN" = yes
 then
-        DISTNAME=cygwin
+	DISTNAME=cygwin
 else
-        DISTNAME=unknown
+	DISTNAME=unknown
 fi
 
 case "$DISTNAME" in
@@ -456,6 +461,10 @@ redhat)
 		     cut -f 5 -d ' '`
 	fi
   ;;
+centos)
+  DISTVER=`cat /etc/redhat-release | grep release |\
+	   cut -f 3 -d ' '`
+  ;;
 fedora)
 	if test `cat /etc/fedora-release | grep release | cut -f 2 -d ' '`x = "Core"x ; then
 	    DISTVER=`cat /etc/fedora-release | grep release |cut -f 4 -d ' '`
diff --git a/regress/tests/maxvol2-test b/regress/tests/maxvol2-test
index f99b1603bd..607d110168 100755
--- a/regress/tests/maxvol2-test
+++ b/regress/tests/maxvol2-test
@@ -30,7 +30,7 @@ update Volume=TestVolume002 maxvoljobs=1
 update Volume=TestVolume003 volretention=10s
 update Volume=TestVolume003 maxvoljobs=1
 list volumes
-setdebug level=50 storage=File1
+setdebug level=150 storage=File1
 run job=$JobName storage=File1 level=full yes
 run job=$JobName storage=File1 level=full yes
 run job=$JobName storage=File1 level=full yes
-- 
2.39.5