Imported Upstream version 3.1.0

[debian/amanda] / changer-src / chg-juke.sh

diff --git a/changer-src/chg-juke.sh b/changer-src/chg-juke.sh
index 9e3809b9c9a75736d5e19410fa7bde0717916e00..23c1e50401784981f5e0a580e047b31ebbe613c0 100755 (executable)
--- a/changer-src/chg-juke.sh
+++ b/changer-src/chg-juke.sh
@@ -42,13 +42,7 @@ set -x
 # the usual config fun
 #
 
-USE_VERSION_SUFFIXES="@USE_VERSION_SUFFIXES@"
-if test "$USE_VERSION_SUFFIXES" = "yes"; then
-        SUF="-@VERSION@";
-else
-       SUF=
-fi
-getconf=$sbindir/amgetconf$SUF
+getconf=$sbindir/amgetconf
 
 #
 # make sure we can find JUKE later
@@ -153,7 +147,7 @@ load_drives() {
        count=`expr $count + 1`
        if [ $count -gt 24 ] 
        then
-           echo `_ '%s %s never came online' "$slot" "$tapedev"`
+           echo `_ '%s %s never came online: %s' "$slot" "$tapedev" "$amdevcheck_message"`
            exit 1
        fi
        sleep 5