From 4b0ede49f95a529bd2d4734c97cdfb86c9badcdd Mon Sep 17 00:00:00 2001 From: Ralf Zerres Date: Sat, 29 Dec 2018 19:13:21 +0100 Subject: [PATCH] tape_admin: update validation of param 'ltfs_devname' Signed-off-by: Ralf Zerres --- bin/tape-admin | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/bin/tape-admin b/bin/tape-admin index b75a176..0dfe3e7 100755 --- a/bin/tape-admin +++ b/bin/tape-admin @@ -562,7 +562,7 @@ ltfs_get_devname () { if [ $RET -eq 1 ]; then ltfs_devname=$(cat $ERRFILE | awk -F ',' ' /Vender ID/ {print $1}' | awk -F '= ' '{print $2}') if [ $verbose -ge 2 ]; then - printf "${MAGENTA}LTFS device name: ${GREEN}'%s'${MAGENTA}\n" \ + printf "${MAGENTA}LTFS device name: ${GREEN}'%s'${NO_COLOR}\n" \ $ltfs_devname fi rm -f ${ERRFILE} @@ -601,12 +601,15 @@ ltfs_format () { } ltfs_is_mounted () { + local ltfs_devname_mounted + if [ $verbose -ge 1 ]; then printf "${BLUE}ltfs_is_mounted...${NO_COLOR}\n" fi - ltfs_devname=$(findmnt -n -T $ltfs_mountpoint -o source | awk -F ':' '{print $2}') - if [ ${#ltfs_devname} -gt 1 ]; then + ltfs_devname_mounted=$(findmnt -n -T $ltfs_mountpoint -o source | awk -F ':' '{print $2}') + if [ ${#ltfs_devname_mounted} -gt 1 ]; then + ltfs_devname=$ltfs_devname_mounted if [ $verbose -ge 2 ]; then printf "${MAGENTA}LTFS tape is mounted via ${GREEN}'%s'${MAGENTA} at ${GREEN}'%s'${NO_COLOR}\n" \ "$ltfs_devname" "$ltfs_mountpoint" @@ -2104,12 +2107,12 @@ trap trapkill TERM INT check_prerequisites -# validate commandline options, set resonable defaults -parse_params $@ - # validate the device name to access ltfs ltfs_get_devname +# validate commandline options, set resonable defaults +parse_params $@ + case $cmd in add-retensiondays) add_retensiondays_to_retensiondate "${mediapool_name}" "${volume_name}" "${retension_days}"