From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2561 invoked by alias); 24 Jun 2009 04:31:09 -0000 Received: (qmail 2554 invoked by alias); 24 Jun 2009 04:31:08 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: fence-agents: master - fence manual: remove hardcoded use of /var To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: fence-agents.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 3032b147adf617ee204e4c837aeeed18e163969b X-Git-Newrev: d35a9f675801ba1926a98b1f074ee5445560fa91 From: "Fabio M. Di Nitto" Message-Id: <20090624043037.96CC8120280@lists.fedorahosted.org> Date: Wed, 24 Jun 2009 04:31:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00750.txt.bz2 Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commitdiff;h=d35a9f675801ba1926a98b1f074ee5445560fa91 Commit: d35a9f675801ba1926a98b1f074ee5445560fa91 Parent: 3032b147adf617ee204e4c837aeeed18e163969b Author: Fabio M. Di Nitto AuthorDate: Wed Jun 24 06:30:07 2009 +0200 Committer: Fabio M. Di Nitto CommitterDate: Wed Jun 24 06:30:07 2009 +0200 fence manual: remove hardcoded use of /var Signed-off-by: Fabio M. Di Nitto --- fence/agents/manual/Makefile.am | 8 ++++++ fence/agents/manual/fence_ack_manual | 37 ------------------------------- fence/agents/manual/fence_ack_manual.in | 37 +++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 37 deletions(-) diff --git a/fence/agents/manual/Makefile.am b/fence/agents/manual/Makefile.am index b2552ab..c29b0ea 100644 --- a/fence/agents/manual/Makefile.am +++ b/fence/agents/manual/Makefile.am @@ -5,3 +5,11 @@ TARGET = fence_ack_manual sbin_SCRIPTS = $(TARGET) EXTRA_DIST = $(TARGET) + +$(TARGET): $(TARGET).in + cat $^ | sed \ + -e 's#@clustervarrun@#${CLUSTERVARRUN}#g' \ + > $@ + +clean-local: + rm -f $(TARGET) diff --git a/fence/agents/manual/fence_ack_manual b/fence/agents/manual/fence_ack_manual deleted file mode 100644 index 83102aa..0000000 --- a/fence/agents/manual/fence_ack_manual +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -# -# Manual override after fencing has failed. -# - -if [ "$1" = "-n" ]; then - shift -fi - -if [ -z "$1" ] || [ "$1" = "-h" ]; then - echo "usage:" - echo " $0 " - echo " $0 -n " - echo - echo "The -n flag exists to preserve compatibility with previous " - echo "releases of $0, and is no longer required." - exit 1 -fi - -declare answer - -echo "About to override fencing for $1." -echo "Improper use of this command can cause severe file system damage." -echo -read -p "Continue [NO/absolutely]? " answer - -if [ "$answer" != "absolutely" ]; then - echo "Aborted." - exit 1 -fi - -while ! [ -e /var/run/cluster/fenced_override ]; do - sleep 1 -done - -echo $1>/var/run/cluster/fenced_override -echo Done diff --git a/fence/agents/manual/fence_ack_manual.in b/fence/agents/manual/fence_ack_manual.in new file mode 100644 index 0000000..69a0aa0 --- /dev/null +++ b/fence/agents/manual/fence_ack_manual.in @@ -0,0 +1,37 @@ +#!/bin/bash +# +# Manual override after fencing has failed. +# + +if [ "$1" = "-n" ]; then + shift +fi + +if [ -z "$1" ] || [ "$1" = "-h" ]; then + echo "usage:" + echo " $0 " + echo " $0 -n " + echo + echo "The -n flag exists to preserve compatibility with previous " + echo "releases of $0, and is no longer required." + exit 1 +fi + +declare answer + +echo "About to override fencing for $1." +echo "Improper use of this command can cause severe file system damage." +echo +read -p "Continue [NO/absolutely]? " answer + +if [ "$answer" != "absolutely" ]; then + echo "Aborted." + exit 1 +fi + +while ! [ -e @clustervarrun@/fenced_override ]; do + sleep 1 +done + +echo $1>@clustervarrun@/fenced_override +echo Done