From 3e36474317687acbff76c22c219e5e668c002e3b Mon Sep 17 00:00:00 2001
From: Ralf Zerres <ralf.zerres@networkx.de>
Date: Thu, 29 Nov 2018 10:33:08 +0100
Subject: [PATCH] tape-admin: cleanup ERRFILE handling

* remove stale error-file
* mtx shouldn't write to stdout

Signed-off-by: Ralf Zerres <ralf.zerres@networkx.de>
---
 bin/tape-admin | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/bin/tape-admin b/bin/tape-admin
index 31b90b7..1595bfa 100755
--- a/bin/tape-admin
+++ b/bin/tape-admin
@@ -604,6 +604,7 @@ ltfs_mount () {
 	    ${LTFS} -o devname=$ltfs_devname -o verbose=0 $ltfs_mountpoint 1>/dev/null 2>${ERRFILE}
 	fi
 	if [ $? -eq 0 ]; then
+	    rm -f ${ERRFILE}
 	    return 0
 	else
 	    # format tape if needed
@@ -1176,7 +1177,7 @@ mtx_load () {
     fi
 
     make_err_file
-    ${MTX} -f $changer_device load $slot_source $drive 2>${ERRFILE}
+    ${MTX} -f $changer_device load $slot_source $drive 1>/dev/null 2>${ERRFILE}
     RET=$?
     rm -f ${ERRFILE}
 }
@@ -1223,11 +1224,11 @@ mtx_unload () {
 	if test $RET -eq 0; then
 	    break
 	fi
-	 grep "Error Code=" ${ERRFILE} 2>/dev/null 1>/dev/null
-	 if test $? -ne 0 ; then
-	     break
-	 fi
-	 sleep $i
+	grep "Error Code=" ${ERRFILE} 2>/dev/null 1>/dev/null
+	if test $? -ne 0 ; then
+	    break
+	fi
+	sleep $i
     done
     cat ${ERRFILE}
     rm -f ${ERRFILE} >/dev/null 2>&1