From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6896 invoked by alias); 12 Feb 2009 09:53:09 -0000 Received: (qmail 6890 invoked by alias); 12 Feb 2009 09:53:08 -0000 X-SWARE-Spam-Status: No, hits=-0.6 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_43,J_CHICKENPOX_72,J_CHICKENPOX_73,SPF_HELO_PASS X-Spam-Status: No, hits=-0.6 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_43,J_CHICKENPOX_72,J_CHICKENPOX_73,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: cluster: RHEL4 - fence: fix WTI RPS-10 to do default reboot To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/RHEL4 X-Git-Reftype: branch X-Git-Oldrev: 8552819f297fa5821d01917878b253c0f42db046 X-Git-Newrev: 6c4a959a07ed7563cce3a38248cb60befae9bf97 From: Jan Friesse Message-Id: <20090212095241.6C1311201DC@lists.fedorahosted.org> Date: Thu, 12 Feb 2009 09:53: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-q1/txt/msg00440.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=6c4a959a07ed7563cce3a38248cb60befae9bf97 Commit: 6c4a959a07ed7563cce3a38248cb60befae9bf97 Parent: 8552819f297fa5821d01917878b253c0f42db046 Author: Jan Friesse AuthorDate: Thu Feb 12 10:52:23 2009 +0100 Committer: Jan Friesse CommitterDate: Thu Feb 12 10:52:23 2009 +0100 fence: fix WTI RPS-10 to do default reboot This patch long lives in master/STABLE2 branch, but never arrive to RHEL4. It's originally created by Lon Hohberger. rhbz#472885 --- fence/agents/rps10/rps10.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/fence/agents/rps10/rps10.c b/fence/agents/rps10/rps10.c index 0fc3e6b..08efd94 100644 --- a/fence/agents/rps10/rps10.c +++ b/fence/agents/rps10/rps10.c @@ -144,7 +144,7 @@ printf(" -d Use serial device . Default=%s\n", printf(" -s Use speed . Default=9600\n" " Valid speeds: 300, 1200, 2400, 9600\n"); printf(" -o Operation to perform.\n"); -printf(" Valid operations: on, off, reboot\n"); +printf(" Valid operations: on, off, [reboot]\n"); printf(" -V Print version and exit\n"); printf(" -v Verbose mode\n\n"); printf("If no options are specified, the following options will be read\n"); @@ -314,8 +314,6 @@ get_options_stdin(char *dev, size_t devlen, int *speed, int *port, int line = 0; char *name, *val; - op[0] = 0; - while (fgets(in, sizeof(in), stdin)) { ++line; @@ -396,6 +394,7 @@ main(int argc, char **argv) char *pname = basename(argv[0]); strncpy(dev, DEFAULT_DEVICE, sizeof(dev)); + strncpy(op, "reboot", sizeof(op)); if (argc > 1) { /*