Ensure that bat.conf is updated when bconsole.conf is

diff --git a/regress/scripts/copy-2client-confs b/regress/scripts/copy-2client-confs
index 4b674508feb3d197f9b222476e5deecf15bbdfd8..e24362ea3f34301ec1aeafb0588d14bc1f714b4b 100755 (executable)
--- a/regress/scripts/copy-2client-confs
+++ b/regress/scripts/copy-2client-confs
@@ -3,6 +3,7 @@
 /bin/cp -f scripts/bacula-sd-2disk-drive.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

diff --git a/regress/scripts/copy-2disk-confs b/regress/scripts/copy-2disk-confs
index 87790955f0c9939589334ee7bab34c3d698b6f04..9b9aee366847db84dace88096812eacad2ee16ff 100755 (executable)
--- a/regress/scripts/copy-2disk-confs
+++ b/regress/scripts/copy-2disk-confs
@@ -6,6 +6,7 @@
 /bin/cp -f scripts/bacula-sd-2disk.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

diff --git a/regress/scripts/copy-2disk-drive-confs b/regress/scripts/copy-2disk-drive-confs
index 7a5dcd30ea716610dff138c499a18385f2a8681e..6fb08807e9684d7c24d54a8a30dc0a64d4c0f871 100755 (executable)
--- a/regress/scripts/copy-2disk-drive-confs
+++ b/regress/scripts/copy-2disk-drive-confs
@@ -3,8 +3,8 @@
 /bin/cp -f scripts/bacula-sd-2disk-drive.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
-

diff --git a/regress/scripts/copy-2drive-confs b/regress/scripts/copy-2drive-confs
index cccce99b00cfebd69594742476aee27e93374363..5f81b7dd4194d8c59d374c0fa4d83725578adc05 100755 (executable)
--- a/regress/scripts/copy-2drive-confs
+++ b/regress/scripts/copy-2drive-confs
@@ -3,6 +3,7 @@
 /bin/cp -f scripts/bacula-sd-2drive.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

diff --git a/regress/scripts/copy-2tape-confs b/regress/scripts/copy-2tape-confs
index 73f2eb449344d7a533c56e525850ff8aee2c76c4..871a4733157af8e6b4349babe31eac3bbdca5cee 100755 (executable)
--- a/regress/scripts/copy-2tape-confs
+++ b/regress/scripts/copy-2tape-confs
@@ -3,6 +3,7 @@
 /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

diff --git a/regress/scripts/copy-btape-confs b/regress/scripts/copy-btape-confs
index c3a9d8ca868c4b9ea139707397461f5abc51fd2c..b1bec0fc2d8483cf98ba03cdc1476fa2a30a0627 100755 (executable)
--- a/regress/scripts/copy-btape-confs
+++ b/regress/scripts/copy-btape-confs
@@ -3,5 +3,6 @@
 /bin/cp -f ${rscripts}/bacula-sd-btape.conf ${scripts}/bacula-sd.conf
 /bin/cp -f ${rscripts}/test-bacula-fd.conf ${scripts}/bacula-fd.conf
 /bin/cp -f ${rscripts}/test-console.conf ${scripts}/bconsole.conf
+/bin/cp -f ${rscripts}/test-console.conf ${scripts}/bat.conf
 
 ${rscripts}/set_tape_options

diff --git a/regress/scripts/copy-confs b/regress/scripts/copy-confs
index 92c59a9cf82b1714a49452638d5103fbb2627e3e..88906ab1425a04368737ef57e1b8cd952d5b05eb 100755 (executable)
--- a/regress/scripts/copy-confs
+++ b/regress/scripts/copy-confs
@@ -4,5 +4,6 @@
 /bin/cp -f ${rscripts}/bacula-sd.conf ${scripts}/bacula-sd.conf
 /bin/cp -f ${rscripts}/bacula-fd.conf ${scripts}/bacula-fd.conf
 /bin/cp -f ${rscripts}/bconsole.conf ${scripts}/bconsole.conf
+/bin/cp -f ${rscripts}/bconsole.conf ${scripts}/bat.conf
 
 ${rscripts}/set_tape_options

diff --git a/regress/scripts/copy-crypto-confs b/regress/scripts/copy-crypto-confs
index c981df30fb92923ad2022e5f5777df1410bb4d8d..df75519d0d02d6fa3b0dcdf8495e8ce230c66844 100755 (executable)
--- a/regress/scripts/copy-crypto-confs
+++ b/regress/scripts/copy-crypto-confs
@@ -3,5 +3,6 @@
 /bin/cp -f scripts/test-bacula-sd.conf bin/bacula-sd.conf
 /bin/cp -f scripts/crypto-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
 /bin/cp -f scripts/cryptokeypair.pem bin/cryptokeypair.pem
 /bin/cp -f scripts/master2048.cert bin/master2048.cert

diff --git a/regress/scripts/copy-fifo-confs b/regress/scripts/copy-fifo-confs
index 7e5dbb5ec91f5eaffecb084f4335b1f21e3861a5..d41b253d594effdd2e84a7ba5e1bc2f770f691e7 100755 (executable)
--- a/regress/scripts/copy-fifo-confs
+++ b/regress/scripts/copy-fifo-confs
@@ -3,5 +3,6 @@
 /bin/cp -f scripts/bacula-sd-fifo.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
 
 scripts/set_tape_options

diff --git a/regress/scripts/copy-migration-confs b/regress/scripts/copy-migration-confs
index c7680bc40e4e468dc4797a7daf6e6a9c162ad661..3add9a67b0a7ebc3aa764a9a31314c2c75d24d95 100755 (executable)
--- a/regress/scripts/copy-migration-confs
+++ b/regress/scripts/copy-migration-confs
@@ -6,3 +6,4 @@
 /bin/cp -f scripts/bacula-sd-migration.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

diff --git a/regress/scripts/copy-plugin-confs b/regress/scripts/copy-plugin-confs
index cc8bf3911e01393821588893433fbaca6789602e..81102c966aed3b9f17bfef759a0a470b4e9c638f 100755 (executable)
--- a/regress/scripts/copy-plugin-confs
+++ b/regress/scripts/copy-plugin-confs
@@ -3,5 +3,6 @@
 /bin/cp -f scripts/test-bacula-sd.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
 
 scripts/set_tape_options

diff --git a/regress/scripts/copy-strip-confs b/regress/scripts/copy-strip-confs
index 36b67f8b03261498314b5f7fcd270fbcb150ecd6..97cf1a4f89a7700c46f140416c8bfa561cce4826 100755 (executable)
--- a/regress/scripts/copy-strip-confs
+++ b/regress/scripts/copy-strip-confs
@@ -3,5 +3,6 @@
 /bin/cp -f scripts/test-bacula-sd.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
 
 scripts/set_tape_options

diff --git a/regress/scripts/copy-tape-confs b/regress/scripts/copy-tape-confs
index c6de726d04c6eb38d0bc5c7c6ebf1303837e76ee..7e04edd2a93a8ab6326283e028c70e9624d58a8a 100755 (executable)
--- a/regress/scripts/copy-tape-confs
+++ b/regress/scripts/copy-tape-confs
@@ -3,5 +3,6 @@
 /bin/cp -f ${rscripts}/bacula-sd-tape.conf ${scripts}/bacula-sd.conf
 /bin/cp -f ${rscripts}/test-bacula-fd.conf ${scripts}/bacula-fd.conf
 /bin/cp -f ${rscripts}/test-console.conf ${scripts}/bconsole.conf
+/bin/cp -f ${rscripts}/test-console.conf ${scripts}/bat.conf
 
 ${rscripts}/set_tape_options

diff --git a/regress/scripts/copy-test-confs b/regress/scripts/copy-test-confs
index 32067113dfcc51dca422419c0da2b3d9ef67c39c..78d1a2ef43507f1894df605cbacdaeebb0381cea 100755 (executable)
--- a/regress/scripts/copy-test-confs
+++ b/regress/scripts/copy-test-confs
@@ -1,7 +1,8 @@
 #!/bin/sh
-/bin/cp -f ${rscripts}/new-test-bacula-dir.conf ${conf}/bacula-dir.conf
-/bin/cp -f ${rscripts}/test-bacula-sd.conf ${conf}/bacula-sd.conf
-/bin/cp -f ${rscripts}/test-bacula-fd.conf ${conf}/bacula-fd.conf
-/bin/cp -f ${rscripts}/test-console.conf ${conf}/bconsole.conf
+/bin/cp -f ${rscripts}/new-test-bacula-dir.conf ${bin}/bacula-dir.conf
+/bin/cp -f ${rscripts}/test-bacula-sd.conf ${bin}/bacula-sd.conf
+/bin/cp -f ${rscripts}/test-bacula-fd.conf ${bin}/bacula-fd.conf
+/bin/cp -f ${rscripts}/test-console.conf ${bin}/bconsole.conf
+/bin/cp -f ${rscripts}/test-console.conf ${bin}/bat.conf
 
 ${rscripts}/set_tape_options

diff --git a/regress/scripts/copy-testa-confs b/regress/scripts/copy-testa-confs
index b4e2f6b94c33d9f7fac19e22664a66f508662f16..8b426527783e2e783081a6bab6c080a13b81c7b3 100755 (executable)
--- a/regress/scripts/copy-testa-confs
+++ b/regress/scripts/copy-testa-confs
@@ -3,5 +3,6 @@
 /bin/cp -f scripts/test-bacula-sd.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
 
 scripts/set_tape_options

diff --git a/regress/scripts/copy-tls-auth-conf b/regress/scripts/copy-tls-auth-conf
index dd9843286cfccd439dfe72cbae4e2a36df2b0df2..1a6d790498897d98d3b569fa86f3d4757f05e09a 100755 (executable)
--- a/regress/scripts/copy-tls-auth-conf
+++ b/regress/scripts/copy-tls-auth-conf
@@ -4,5 +4,6 @@
 /bin/cp -f scripts/tls-auth-bacula-sd.conf bin/bacula-sd.conf
 /bin/cp -f scripts/tls-auth-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
 /bin/cp -f scripts/tls-CA.pem bin/tls-CA.pem
 /bin/cp -f scripts/tls-cert.pem bin/tls-cert.pem

diff --git a/regress/scripts/copy-tls-confs b/regress/scripts/copy-tls-confs
index af61e453cd5d2aea77574985868545ba5526a562..16129a8200df61b5421ab884a7c1d04140fd9e2c 100755 (executable)
--- a/regress/scripts/copy-tls-confs
+++ b/regress/scripts/copy-tls-confs
@@ -4,5 +4,6 @@
 /bin/cp -f scripts/tls-bacula-sd.conf bin/bacula-sd.conf
 /bin/cp -f scripts/tls-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
 /bin/cp -f scripts/tls-CA.pem bin/tls-CA.pem
 /bin/cp -f scripts/tls-cert.pem bin/tls-cert.pem

diff --git a/regress/scripts/copy-virtual-confs b/regress/scripts/copy-virtual-confs
index 3fd3e4868eac660b0b715be02ac60bdb3391353d..177ec5280ef488b2c9ca6442b607f2f11ffe76e9 100755 (executable)
--- a/regress/scripts/copy-virtual-confs
+++ b/regress/scripts/copy-virtual-confs
@@ -6,3 +6,4 @@
 /bin/cp -f scripts/bacula-sd-virtual.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

diff --git a/regress/scripts/copy-win32-confs b/regress/scripts/copy-win32-confs
index e3cc5fd8fc9ce3f046026794e1bf81d8566049d6..019c9cd3e77d0a4b5787008da4f38ca79e367cbc 100755 (executable)
--- a/regress/scripts/copy-win32-confs
+++ b/regress/scripts/copy-win32-confs
@@ -3,5 +3,6 @@
 /bin/cp -f scripts/win32-bacula-sd-tape.conf bin/bacula-sd.conf
 /bin/cp -f scripts/win32-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
 
 scripts/set_tape_options