From c2ed16e0478f820c11387d52f4fec878d08e36f4 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 17 Feb 2013 15:53:26 +0100 Subject: [PATCH] Apply patch for chio-changer-openbsd from bug #1984 -- Implements listall --- .../autochangers/chio-changer-openbsd | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/bacula/examples/autochangers/chio-changer-openbsd b/bacula/examples/autochangers/chio-changer-openbsd index fa150fbbb4..050095a679 100644 --- a/bacula/examples/autochangers/chio-changer-openbsd +++ b/bacula/examples/autochangers/chio-changer-openbsd @@ -1,12 +1,10 @@ #!/bin/sh # -# $OpenBSD: chio-changer-openbsd,v 1.1 2012/07/04 12:02:56 ajacoutot Exp $ -# # Bacula interface to chio(1) autoloader for OpenBSD # # Adapted from NetBSD pkgsrc and examples/autochangers in bacula source) # by Antoine Jacoutot for OpenBSD. -# Tested on an LTO-4 device with 8 slots. +# Tested on an LTO-4 device with 1 drive and 8 slots. # The user Bacula is running as needs rw access to the ch(4) and st(4) # devices. # @@ -23,11 +21,11 @@ # the chio exit code or a 0. If the script exits with a non-zero # exit code, Bacula will assume the request failed. -CHIO=/bin/chio - # time (in seconds) for the unit to settle after (un)loading a tape SLEEP=1 +CHIO=/bin/chio + usage() { echo "usage: ${0##*/} ctl-device command [slot archive-device drive-index]" } @@ -85,7 +83,6 @@ case ${cmd} in [ ${rtn} -eq 0 ] && sleep ${SLEEP} exit ${rtn} ;; - load) ${CHIO} -f ${ctl} move slot $((${slot} - 1)) drive ${drive} rtn=$? @@ -98,17 +95,29 @@ case ${cmd} in awk -F: '{ print $1 + 1 ":" $2 }' exit $? ;; - listall) - echo "The listall command is not implemented on OpenBSD." - exit 1 - ;; + # XXX only one drive is queried + _list=$(${0} ${1} list) + _loaded_s=$(${0} ${1} loaded ${slot} ${device} ${drive}) + _loaded_t=$(${CHIO} -f ${ctl} status -v | grep "drive ${drive}" | awk '{ print $NF }' | sed -e 's,<,,' -e 's,:.*,,') + [ -n "${_list}" -a -n "${_loaded_s}" -a -n "${_loaded_t}" ] || exit 1 + + (for i in ${_list}; do + echo "S:${i}" | sed 's/\(.*\):/\1:F:/' + done + echo S:${_loaded_s}:E + if [ "${_loaded_s}" -ne 0 ]; then + echo D:${drive}:F:${_loaded_s}:${_loaded_t} + else + echo D:${drive}:E + fi) | sort + ;; loaded) # XXX output the first empty slot if the drive is loaded - _slot=`${CHIO} -f ${ctl} status -v | egrep '^slot.* voltag: <:[0-9]>$' | awk '{ print $2 }' | awk -F: '{ print $1 + 1 }'` + _slot=$(${CHIO} -f ${ctl} status -v | egrep '^slot.* voltag: <:[0-9]>$' | awk '{ print $2 }' | awk -F: '{ print $1 + 1 }') rtn=$? - _loaded=`${CHIO} -f ${ctl} status -v | egrep "^drive ${drive}: voltag: <.*:[0-9]>"` + _loaded=$(${CHIO} -f ${ctl} status -v | egrep "^drive ${drive}: voltag: <.*:[0-9]>") [ -z "${_slot}" -o -z "${_loaded}" ] && _slot=0 echo ${_slot} | awk '{ print $1 }' exit ${rtn} -- 2.39.5