diff options
| author | gdt <gdt@pkgsrc.org> | 2007-02-07 02:04:15 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2007-02-07 02:04:15 +0000 |
| commit | 660135b59e255b7a55e17ec44c9b9e7723355f73 (patch) | |
| tree | cadc574f69e4efc0f4c3fa75be28a3930abcb927 /sysutils | |
| parent | a22fa4da4d4203c2dad5c2728550c460dffd2954 (diff) | |
| download | pkgsrc-660135b59e255b7a55e17ec44c9b9e7723355f73.tar.gz | |
add patch:
Make chg-chio wait for a tape to come ready after loading it.
clean up $MT/@MT@ confusion in chg-chio
Patch from Aaron Grier in PR pkg/35231.
(This resolves issue #1 in the PR; issue #2 is unrelated.)
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/amanda-server/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/amanda-server/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/amanda-server/patches/patch-ap | 38 |
3 files changed, 42 insertions, 3 deletions
diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile index b70f406233a..35c184d8ce3 100644 --- a/sysutils/amanda-server/Makefile +++ b/sysutils/amanda-server/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.39 2007/01/05 13:20:54 obache Exp $ +# $NetBSD: Makefile,v 1.40 2007/02/07 02:04:15 gdt Exp $ PKGNAME= amanda-server-${VERS} -PKGREVISION= 5 +PKGREVISION= 6 SVR4_PKGNAME= amase COMMENT= Server part of Amanda, a network backup system diff --git a/sysutils/amanda-server/distinfo b/sysutils/amanda-server/distinfo index eadb2899859..c1831253d9d 100644 --- a/sysutils/amanda-server/distinfo +++ b/sysutils/amanda-server/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2007/01/05 13:20:54 obache Exp $ +$NetBSD: distinfo,v 1.11 2007/02/07 02:04:15 gdt Exp $ SHA1 (amanda-2.4.4p4.tar.gz) = e44b40ea0f8e51336716ab455b27c69f4616d7f6 RMD160 (amanda-2.4.4p4.tar.gz) = d145a5ebb0df340af6aee0e8a15da6b54dfb3051 @@ -18,3 +18,4 @@ SHA1 (patch-al) = dfd85511e2441be2f4a7428ee964310f3fd5374c SHA1 (patch-am) = 4949524ff94afa54c0c5ad7cd4bb673c51f73815 SHA1 (patch-an) = a7a6d2777e94d06eba8bf51857b95043a65be6e4 SHA1 (patch-ao) = 553a724fbe3422397ea9473c7d59b1139eca224f +SHA1 (patch-ap) = fde38b4718968cdf15c2f62b83ed9156d252ac08 diff --git a/sysutils/amanda-server/patches/patch-ap b/sysutils/amanda-server/patches/patch-ap new file mode 100644 index 00000000000..f902c9ddcd6 --- /dev/null +++ b/sysutils/amanda-server/patches/patch-ap @@ -0,0 +1,38 @@ +$NetBSD: patch-ap,v 1.1 2007/02/07 02:04:15 gdt Exp $ + +--- changer-src/chg-chio.pl.in.orig 2003-11-21 14:09:35.000000000 -0500 ++++ changer-src/chg-chio.pl.in +@@ -281,6 +281,13 @@ sub Load { + print "$progname: cannot '@CHIO@ -f $changerDevice move' tape $tape into drive 0\n"; + exit(2); + } ++ ++ # wait for tape to load ++ do { ++ print LOG &do_time(), ": waiting for tape to load\n"; ++ sleep 30; ++ } while ( system("$MT $MTF $tapeDevice status > /dev/null 2>&1" ) ); ++ + print LOG &do_time(), ": leave: Load\n"; + } + +@@ -302,8 +309,8 @@ sub Unload { + # firmware rev but for now it's safest to just explicitly eject + # the tape before moving the cartridge. + # +- if ( system ("@MT@ @MT_FILE_FLAG@ $tapeDevice offline") ) { +- print "$progname: Warning, failed to eject the tape with '@MT@ @MT_FILE_FLAG@ $tapeDevice offline'\n"; ++ if ( system ("$MT $MTF $tapeDevice offline") ) { ++ print "$progname: Warning, failed to eject the tape with '$MT $MTF $tapeDevice offline'\n"; + # NB: not fatal; let chio try it's thing + } + +@@ -370,7 +377,7 @@ if (-x "$sbindir/ammt$SUF") { + print "<none> mt program not found\n"; + exit(1); + } +-print LOG &do_time(), "MT -> $MT $MTF\n"; ++print LOG &do_time(), ": MT -> $MT $MTF\n"; + + system ("$MT $MTF $tapeDevice rewind") + unless $currentTape == 0; |