From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 3 Aug 2005 11:58:27 +0000 (+0000)
Subject: Update
X-Git-Tag: Release-1.38.0~222
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=be933ce20669df101469c28c70290885466c28f5;p=bacula%2Fbacula

Update


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

diff --git a/regress/Makefile.in b/regress/Makefile.in
index ef308a90bd..6b23951e2f 100644
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -35,8 +35,8 @@ bacula: all sed
 	scripts/setup ${BACULA_SOURCE} ${EMAIL} ${WHICHDB} ${TCPWRAPPERS}
 
 sed:
-	echo "Doing: scripts/do_sed ${EMAIL} ${TAPE_DRIVE} ${AUTOCHANGER} ${AUTOCHANGER_PATH}"
-	scripts/do_sed ${EMAIL} ${TAPE_DRIVE} ${AUTOCHANGER} ${AUTOCHANGER_PATH}
+	echo "Doing: scripts/do_sed ${EMAIL} ${TAPE_DRIVE} ${AUTOCHANGER} ${AUTOCHANGER_PATH} ${TAPE_DRIVE1}"
+	scripts/do_sed ${EMAIL} ${TAPE_DRIVE} ${AUTOCHANGER} ${AUTOCHANGER_PATH} ${TAPE_DRIVE1}
 
 # Run all non-root userid tests
 test: 
diff --git a/regress/scripts/bacula-sd-2drive.conf.in b/regress/scripts/bacula-sd-2drive.conf.in
index 6b56927468..cf3d543752 100644
--- a/regress/scripts/bacula-sd-2drive.conf.in
+++ b/regress/scripts/bacula-sd-2drive.conf.in
@@ -34,7 +34,7 @@ Director {
 Autochanger {
   Name = DDS-4
   Changer Device = @autochanger@
-  Changer Command ="@scriptdir@/mtx-changer %c %o %S %a"
+  Changer Command ="@scriptdir@/mtx-changer %c %o %S %a %d"
   Device = Drive-0, Drive-1
 }
 
@@ -57,7 +57,7 @@ Device {
   Archive Device = @tape_drive1@
   AutomaticMount = yes;               # when device opened, read it
   Autochanger = yes
-  Drive Index = 0
+  Drive Index = 1
   AlwaysOpen = yes;
   RemovableMedia = yes;
   @@sbindir@/tape_options
diff --git a/regress/scripts/do_sed b/regress/scripts/do_sed
index f264e3ba81..35a5947902 100755
--- a/regress/scripts/do_sed
+++ b/regress/scripts/do_sed
@@ -46,7 +46,7 @@ sed -f ${out} ${cwd}/scripts/cleanup-2drive.in >${cwd}/scripts/cleanup-2drive
 sed -f ${out} ${cwd}/scripts/prepare-two-tapes.in >${cwd}/scripts/prepare-two-tapes
 cp ${cwd}/bin/bacula-sd.conf /tmp/bac$$
 sed s%/tmp%${cwd}/tmp%g /tmp/bac$$ >${cwd}/bin/bacula-sd.conf
-chmod 777 ${cwd}/scripts/cleanup-*tape ${cwd}/scripts/prepare-two-tapes
+chmod 777 ${cwd}/scripts/cleanup-*tape ${cwd}/scripts/cleanup-*drive ${cwd}/scripts/prepare-two-tapes
 rm -f /tmp/bac$$
 cp ${cwd}/bin/mtx-changer /tmp/bac$$
 sed "s%^MTX.*$%MTX=${4}%g" /tmp/bac$$ >${cwd}/bin/mtx-changer