From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 22 Mar 2008 13:09:28 +0000 (+0000)
Subject: Tweak get_os
X-Git-Tag: Release-3.0.0~1643
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ed8fb57194df4d098988e39fe3cc1317c99a29ff;p=bacula%2Fbacula

Tweak get_os

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

diff --git a/regress/scripts/get-os b/regress/scripts/get-os
index 64cb63cc1b..7b3d1aa644 100755
--- a/regress/scripts/get-os
+++ b/regress/scripts/get-os
@@ -434,6 +434,15 @@ debian)
         else
            DISTVER=`cat /etc/debian_version`
         fi
+        if test -f /etc/lsb-release ; then
+           . /etc/lsb-release
+           if test "x$DISTRIB_ID" != "x" ; then
+              DISTNAME=$DISTRIB_ID
+           fi
+           if test "x$DISTRIB_RELEASE" != "x" ; then
+              DISTVER=$DISTRIB_RELEASE
+           fi
+        fi
   ;;
 freebsd)
         DISTVER=`uname -a |awk '{print $3}'`
diff --git a/regress/tests/incremental-1t1d-tape b/regress/tests/incremental-1t1d-tape
index f161628312..75dc046a9d 100755
--- a/regress/tests/incremental-1t1d-tape
+++ b/regress/tests/incremental-1t1d-tape
@@ -7,7 +7,8 @@ TestName="incremental-1t1d-tape"
 JobName=IncTape
 . scripts/functions
 
-copy_tape_confs
+scripts/copy-tape-confs
+scripts/cleanup-tape
 
 echo "${cwd}/tmp/build" >${cwd}/tmp/file-list
 if test ! -d ${cwd}/tmp/build ; then
diff --git a/regress/tests/relabel-1t1d-tape b/regress/tests/relabel-1t1d-tape
index 69a36f61ab..a4bca3f26a 100755
--- a/regress/tests/relabel-1t1d-tape
+++ b/regress/tests/relabel-1t1d-tape
@@ -10,6 +10,7 @@ JobName=Relabeltape
 
 scripts/cleanup-tape
 scripts/copy-tape-confs
+
 echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_jobname $JobName
diff --git a/regress/tests/restore-by-file-1t1d-tape b/regress/tests/restore-by-file-1t1d-tape
index 8ac4118cf1..7dea206fe0 100755
--- a/regress/tests/restore-by-file-1t1d-tape
+++ b/regress/tests/restore-by-file-1t1d-tape
@@ -9,7 +9,8 @@
 TestName="restore-by-file-1t1d-tape"
 JobName=restorebyfile
 . scripts/functions
-copy_tape_confs
+scripts/copy-tape-confs
+scripts/cleanup-tape
 
 echo "${cwd}/build" >${cwd}/tmp/file-list
 sed s%\^%${cwd}% ${cwd}/scripts/flist | sort | uniq >${cwd}/tmp/restore2-list
diff --git a/regress/tests/restore-seek-tape b/regress/tests/restore-seek-tape
index aa394beb60..7d5b17b0d2 100755
--- a/regress/tests/restore-seek-tape
+++ b/regress/tests/restore-seek-tape
@@ -10,7 +10,9 @@ TestName="restore-seek-tape"
 JobName=restore-tape-seek
 . scripts/functions
 
-copy_tape_confs
+scripts/copy-tape-confs
+scripts/cleanup-tape
+
 echo "${cwd}/tmp/build" >${cwd}/tmp/file-list
 rm -rf ${cwd}/tmp/build
 mkdir ${cwd}/tmp/build
diff --git a/regress/tests/small-file-size-1t1d-tape b/regress/tests/small-file-size-1t1d-tape
index 49dbe2130e..658832339a 100755
--- a/regress/tests/small-file-size-1t1d-tape
+++ b/regress/tests/small-file-size-1t1d-tape
@@ -7,7 +7,8 @@ TestName="small-file-size-1t1d-tape"
 JobName=smallfilesize
 . scripts/functions
 
-copy_tape_confs
+scripts/copy-tape-confs
+scripts/cleanup-tape
 
 echo "${cwd}/build" >${cwd}/tmp/file-list
 cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
diff --git a/regress/tests/truncate-bug-1t1d-tape b/regress/tests/truncate-bug-1t1d-tape
index 8be197d859..ac28b281e1 100755
--- a/regress/tests/truncate-bug-1t1d-tape
+++ b/regress/tests/truncate-bug-1t1d-tape
@@ -6,7 +6,8 @@ TestName="truncate-bug-1t1d-tape"
 JobName=truncatebug
 . scripts/functions
 
-copy_tape_confs
+scripts/copy-tape-confs
+scripts/cleanup-tape
 
 echo "${cwd}/build" >${cwd}/tmp/file-list
 
diff --git a/regress/tests/verify-vol-1t1d-tape b/regress/tests/verify-vol-1t1d-tape
index 914422f71b..1670ed1879 100755
--- a/regress/tests/verify-vol-1t1d-tape
+++ b/regress/tests/verify-vol-1t1d-tape
@@ -7,7 +7,8 @@ TestName="verify-vol-1t1d-tape"
 JobName=VerifyVol
 . scripts/functions
 
-copy_tape_confs
+scripts/copy-tape-confs
+scripts/cleanup-tape
 
 echo "${cwd}/build" >${cwd}/tmp/file-list