projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 3.1.0
[debian/amanda]
/
changer-src
/
chg-chio.pl
diff --git
a/changer-src/chg-chio.pl
b/changer-src/chg-chio.pl
index 56bb35875f2b7a4d15fe0ad822235780abbbe331..e97ae9a62ed0cee82462bee69f82c48aa72cd2a6 100644
(file)
--- a/
changer-src/chg-chio.pl
+++ b/
changer-src/chg-chio.pl
@@
-63,17
+63,11
@@
$prefix=$prefix; # avoid warnings about possible typo
$exec_prefix="@exec_prefix@";
$exec_prefix=$exec_prefix; # Ditto
$sbindir="@sbindir@";
$exec_prefix="@exec_prefix@";
$exec_prefix=$exec_prefix; # Ditto
$sbindir="@sbindir@";
-if ( "@USE_VERSION_SUFFIXES@" eq "yes" ) {
- $SUF = "-@VERSION@";
-} else {
- $SUF = "";
-}
-
-chomp ($tapeDevice = `$sbindir/amgetconf$SUF tapedev 2>&1`);
+chomp ($tapeDevice = `$sbindir/amgetconf tapedev 2>&1`);
die "tapedev not found in amanda.conf"
if !$tapeDevice or $tapeDevice eq "" or
$tapeDevice =~ m/no such parameter/;
die "tapedev not found in amanda.conf"
if !$tapeDevice or $tapeDevice eq "" or
$tapeDevice =~ m/no such parameter/;
-chomp ($changerDevice = `$sbindir/amgetconf
$SUF
changerdev 2>&1`);
+chomp ($changerDevice = `$sbindir/amgetconf changerdev 2>&1`);
chomp $changerDevice;
die "changerdev not found in amanda.conf"
if !$changerDevice or $changerDevice eq "" or
chomp $changerDevice;
die "changerdev not found in amanda.conf"
if !$changerDevice or $changerDevice eq "" or
@@
-374,8
+368,8
@@
$nr_tapes = &getTapeStatus();
# Before we do anything with the tape changer we'll have to rewind the tape
#
# Before we do anything with the tape changer we'll have to rewind the tape
#
-if (-x "$sbindir/ammt
$SUF
") {
- $MT="$sbindir/ammt
$SUF
";
+if (-x "$sbindir/ammt") {
+ $MT="$sbindir/ammt";
$MTF="-f";
} elsif (-x "@MT@") {
$MT="@MT@";
$MTF="-f";
} elsif (-x "@MT@") {
$MT="@MT@";