Imported Upstream version 2.5.2p1

[debian/amanda] / changer-src / chg-disk.sh.in

diff --git a/changer-src/chg-disk.sh.in b/changer-src/chg-disk.sh.in
index c4f59f700ddf86df8b17f3bdb21c956f203aac42..5ac3783e110a3da2e0c70f609bbcac47097f2639 100644 (file)
--- a/changer-src/chg-disk.sh.in
+++ b/changer-src/chg-disk.sh.in
@@ -83,7 +83,7 @@ MYNAME=$0
 
 TAPE=`amgetconf$SUF tapedev`
 if test X"$TAPE" == X""; then
-    echo "<none> tapedev not specified in amanda.conf." 1>&2
+    echo "<none> tapedev not specified in amanda.conf."
     exit 2
 fi
 SLOTDIR=`echo $TAPE | sed 's/^file://'`
@@ -99,11 +99,11 @@ isinteger() {
 
 # Need rwx access to the virtual tape itself.
 if ! test -d $SLOTDIR; then
-    echo "Virtual-tape directory $SLOTDIR does not exist." 1>&2
+    echo "<none> Virtual-tape directory $SLOTDIR does not exist."
     exit 2
 fi
 if ! test -w $SLOTDIR; then
-    echo "Virtual-tape directory $SLOTDIR is not writable." 1>&2
+    echo "<none> Virtual-tape directory $SLOTDIR is not writable."
     exit 2
 fi
 
@@ -120,21 +120,21 @@ fi
 
 CFDir=`dirname ${CHANGERFILE}`
 [ -d ${CFDir} -a -r ${CFDir} -a -w ${CFDir} -a -x ${CFDir} ] ||
-       { echo "$MYNAME: need 'rwx' access to '$CFDir'" 1>&2 ; exit 2 ; }
+       { echo "<none> $MYNAME: need 'rwx' access to '$CFDir'"; exit 2 ; }
 
 # check or create changer metadata files
 ACCESSFILE=$CHANGERFILE-access
 [ -f $ACCESSFILE -a -r $ACCESSFILE -a -w $ACCESSFILE ] ||
        echo 0 > $ACCESSFILE ||
-       { echo "$MYNAME: could not access or create '$ACCESSFILE'" 1>&2 ; exit 2 ; }
+       { echo "<none> $MYNAME: could not access or create '$ACCESSFILE'" ; exit 2 ; }
 CLEANFILE=$CHANGERFILE-clean
 [ -f $CLEANFILE -a -r $CLEANFILE -a -w $CLEANFILE ] ||
        echo 0 > $CLEANFILE ||
-       { echo "$MYNAME: could not access or create '$CLEANFILE'" 1>&2 ; exit 2 ; }
+       { echo "<none> $MYNAME: could not access or create '$CLEANFILE'" ; exit 2 ; }
 SLOTFILE=$CHANGERFILE-slot
 [ -f $SLOTFILE -a -r $SLOTFILE -a -w $SLOTFILE ] ||
        echo 0 > $SLOTFILE ||
-       { echo "$MYNAME: could not access or create '$SLOTFILE'" 1>&2 ; exit 2 ; }
+       { echo "<none> $MYNAME: could not access or create '$SLOTFILE'" ; exit 2 ; }
 
 # read and check metadata
 ACCESSCOUNT=`cat $ACCESSFILE`
@@ -310,7 +310,7 @@ while [ $# -ge 1 ];do
             eject
             ;;
     *)
-       echo "Unknown option $1"
+       echo "<none> Unknown option $1"
        exit 2
        ;;
   esac