Merge branch 'master' into basejobv3

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

diff --git a/regress/scripts/copy-2drive-confs b/regress/scripts/copy-2drive-confs
index 0388c4c1752c7a0ce5450f0c47ac8bf3403b3c0c..cccce99b00cfebd69594742476aee27e93374363 100755 (executable)
--- a/regress/scripts/copy-2drive-confs
+++ b/regress/scripts/copy-2drive-confs
@@ -8,8 +8,4 @@ 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
-cp -f scripts/linux_tape_options bin/tape_options
-if test x`uname` = xFreeBSD ; then
-   cp -f scripts/freebsd_tape_options bin/tape_options
-fi
+scripts/set_tape_options