Add logdir and bsrdir to regression config

[bacula/bacula] / regress / scripts / copy-2tape-confs

diff --git a/regress/scripts/copy-2tape-confs b/regress/scripts/copy-2tape-confs
index 26f4f01088859e95ed1c74521fa533454051db0b..871a4733157af8e6b4349babe31eac3bbdca5cee 100755 (executable)
--- a/regress/scripts/copy-2tape-confs
+++ b/regress/scripts/copy-2tape-confs
@@ -3,17 +3,10 @@
 /bin/cp -f scripts/bacula-sd-2tape.conf bin/bacula-sd.conf
 /bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf
 /bin/cp -f scripts/test-console.conf bin/bconsole.conf
+/bin/cp -f scripts/test-console.conf bin/bat.conf
 outf="tmp/sed_tmp"
 echo "s%# Autochanger = yes%  Autochanger = yes%g" >${outf}
 cp bin/bacula-dir.conf tmp/1
 sed -f ${outf} tmp/1 >bin/bacula-dir.conf
 
-# get proper SD tape definitions
-if [ x$USE_VTAPE = xyes ]; then
-    cp -f scripts/vtape_tape_options bin/tape_options
-else
-    cp -f scripts/linux_tape_options bin/tape_options
-fi
-if test x`uname` = xFreeBSD ; then
-   cp -f scripts/freebsd_tape_options bin/tape_options
-fi
+scripts/set_tape_options