From: <ke...@us...> - 2008-03-20 08:59:09
|
Revision: 6647 http://bacula.svn.sourceforge.net/bacula/?rev=6647&view=rev Author: kerns Date: 2008-03-20 01:59:13 -0700 (Thu, 20 Mar 2008) Log Message: ----------- Update prepare-two-tapes for Debian Modified Paths: -------------- branches/Branch-2.2/regress/scripts/prepare-two-tapes.in Modified: branches/Branch-2.2/regress/scripts/prepare-two-tapes.in =================================================================== --- branches/Branch-2.2/regress/scripts/prepare-two-tapes.in 2008-03-20 08:57:40 UTC (rev 6646) +++ branches/Branch-2.2/regress/scripts/prepare-two-tapes.in 2008-03-20 08:59:13 UTC (rev 6647) @@ -2,6 +2,16 @@ # # Create two blank tapes # + +# mt status output +# SunOS No Additional Sense +# FreeBSD Current Driver State: at rest. +# Linux ONLINE +# Note Debian has an inferior mt. When no tape is in the +# drive it waits 2 minutes. When a tape is in the drive, it +# prints user unfriendly output. +# + OS=`uname` case ${OS} in SunOS) @@ -10,14 +20,19 @@ FreeBSD) ready="Current Driver State: at rest." ;; - *) - ready="ONLINE" + Linux) + if test -e /etc/debian_version ; then + ready="drive status" + else + ready="ONLINE" + fi ;; esac + wait_for_drive() { i=0 while [ $i -le 300 ]; do # Wait max 300 seconds - if mt -f $1 status | grep ${ready} >/dev/null 2>&1; then + if mt -f $1 status 2>&1 | grep "${ready}" >/dev/null 2>&1; then break fi # debug "Device $1 - not ready, retrying..." This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ri...@us...> - 2008-06-01 08:02:49
|
Revision: 7080 http://bacula.svn.sourceforge.net/bacula/?rev=7080&view=rev Author: ricozz Date: 2008-06-01 01:02:56 -0700 (Sun, 01 Jun 2008) Log Message: ----------- ebl prepare for faketape tests Modified Paths: -------------- branches/Branch-2.2/regress/scripts/prepare-two-tapes.in Modified: branches/Branch-2.2/regress/scripts/prepare-two-tapes.in =================================================================== --- branches/Branch-2.2/regress/scripts/prepare-two-tapes.in 2008-06-01 07:10:16 UTC (rev 7079) +++ branches/Branch-2.2/regress/scripts/prepare-two-tapes.in 2008-06-01 08:02:56 UTC (rev 7080) @@ -8,13 +8,12 @@ scripts/cleanup if test x@autochanger@ != x/dev/null; then - slot=`bin/mtx-changer @autochanger@ loaded 0 dummy $DRIVE1` + slot=`bin/@changer_script@ @autochanger@ loaded 0 dummy $DRIVE1` if test "x${slot}" != "x$SLOT2"; then - bin/mtx-changer @autochanger@ unload $slot @tape_drive@ $DRIVE1 - bin/mtx-changer @autochanger@ load $SLOT2 @tape_drive@ $DRIVE1 + bin/@changer_script@ @autochanger@ unload $slot @tape_drive@ $DRIVE1 + bin/@changer_script@ @autochanger@ load $SLOT2 @tape_drive@ $DRIVE1 fi - mt -f @tape_drive@ rewind - mt -f @tape_drive@ weof + init_drive @tape_drive@ fi @@ -22,12 +21,12 @@ # If we have an autochanger always load tape in slot 1 # if test x@autochanger@ != x/dev/null; then - slot=`bin/mtx-changer @autochanger@ loaded 0 dummy $DRIVE1` + slot=`bin/@changer_script@ @autochanger@ loaded 0 dummy $DRIVE1` if test "x${slot}" != "x$SLOT1"; then - bin/mtx-changer @autochanger@ unload $slot @tape_drive@ $DRIVE1 - bin/mtx-changer @autochanger@ load $SLOT1 @tape_drive@ $DRIVE1 + bin/@changer_script@ @autochanger@ unload $slot @tape_drive@ $DRIVE1 + bin/@changer_script@ @autochanger@ load $SLOT1 @tape_drive@ $DRIVE1 fi fi -mt -f @tape_drive@ rewind -mt -f @tape_drive@ weof +init_drive @tape_drive@ + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ri...@us...> - 2008-06-01 08:14:06
|
Revision: 7081 http://bacula.svn.sourceforge.net/bacula/?rev=7081&view=rev Author: ricozz Date: 2008-06-01 01:14:14 -0700 (Sun, 01 Jun 2008) Log Message: ----------- ebl fix two-pool-tape for faketape Modified Paths: -------------- branches/Branch-2.2/regress/scripts/prepare-two-tapes.in Modified: branches/Branch-2.2/regress/scripts/prepare-two-tapes.in =================================================================== --- branches/Branch-2.2/regress/scripts/prepare-two-tapes.in 2008-06-01 08:02:56 UTC (rev 7080) +++ branches/Branch-2.2/regress/scripts/prepare-two-tapes.in 2008-06-01 08:14:14 UTC (rev 7081) @@ -8,7 +8,7 @@ scripts/cleanup if test x@autochanger@ != x/dev/null; then - slot=`bin/@changer_script@ @autochanger@ loaded 0 dummy $DRIVE1` + slot=`bin/@changer_script@ @autochanger@ loaded 0 @tape_drive@ $DRIVE1` if test "x${slot}" != "x$SLOT2"; then bin/@changer_script@ @autochanger@ unload $slot @tape_drive@ $DRIVE1 bin/@changer_script@ @autochanger@ load $SLOT2 @tape_drive@ $DRIVE1 @@ -21,7 +21,7 @@ # If we have an autochanger always load tape in slot 1 # if test x@autochanger@ != x/dev/null; then - slot=`bin/@changer_script@ @autochanger@ loaded 0 dummy $DRIVE1` + slot=`bin/@changer_script@ @autochanger@ loaded 0 @tape_drive@ $DRIVE1` if test "x${slot}" != "x$SLOT1"; then bin/@changer_script@ @autochanger@ unload $slot @tape_drive@ $DRIVE1 bin/@changer_script@ @autochanger@ load $SLOT1 @tape_drive@ $DRIVE1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |