From 5db7ec3b4a33f4e9364e960cb311f7ba6b5ec81a Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sun, 3 Mar 2013 12:53:21 +0000 Subject: [PATCH] Redo the autochanger patch to not include CVS tag which breaks 'make patch' reported by krw@ --- ...examples_autochangers_chio-changer-openbsd | 24 ++++--------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/sysutils/bacula/patches/patch-examples_autochangers_chio-changer-openbsd b/sysutils/bacula/patches/patch-examples_autochangers_chio-changer-openbsd index dacc8a7c744..2cd403453bd 100644 --- a/sysutils/bacula/patches/patch-examples_autochangers_chio-changer-openbsd +++ b/sysutils/bacula/patches/patch-examples_autochangers_chio-changer-openbsd @@ -1,25 +1,11 @@ -$OpenBSD: patch-examples_autochangers_chio-changer-openbsd,v 1.2 2013/03/02 13:54:52 ajacoutot Exp $ +$OpenBSD: patch-examples_autochangers_chio-changer-openbsd,v 1.3 2013/03/03 12:53:21 ajacoutot Exp $ http://bugs.bacula.org/view.php?id=1937 http://bugs.bacula.org/view.php?id=1984 --- examples/autochangers/chio-changer-openbsd.orig Thu Sep 13 10:51:19 2012 -+++ examples/autochangers/chio-changer-openbsd Thu Feb 14 13:52:54 2013 -@@ -1,12 +1,10 @@ - #!/bin/sh - # --# $OpenBSD: patch-examples_autochangers_chio-changer-openbsd,v 1.2 2013/03/02 13:54:52 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 @@ ++++ examples/autochangers/chio-changer-openbsd Sun Mar 3 13:51:01 2013 +@@ -23,11 +23,11 @@ # the chio exit code or a 0. If the script exits with a non-zero # exit code, Bacula will assume the request failed. @@ -33,7 +19,7 @@ http://bugs.bacula.org/view.php?id=1984 usage() { echo "usage: ${0##*/} ctl-device command [slot archive-device drive-index]" } -@@ -85,7 +83,6 @@ case ${cmd} in +@@ -85,7 +85,6 @@ case ${cmd} in [ ${rtn} -eq 0 ] && sleep ${SLEEP} exit ${rtn} ;; @@ -41,7 +27,7 @@ http://bugs.bacula.org/view.php?id=1984 load) ${CHIO} -f ${ctl} move slot $((${slot} - 1)) drive ${drive} rtn=$? -@@ -95,20 +92,35 @@ case ${cmd} in +@@ -95,20 +94,35 @@ case ${cmd} in list) ${CHIO} -f ${ctl} status -v slot | \ sed -ne 's/^slot *\([0-9]*:\).*FULL.*voltag.*<\(.*\):.*/\1\2/p' | \