Send Linux-ha-cvs mailing list submissions to linux-ha-cvs@lists.linux-ha.org
To subscribe or unsubscribe via the World Wide Web, visit http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs or, via email, send a message with subject or body 'help' to [EMAIL PROTECTED] You can reach the person managing the list at [EMAIL PROTECTED] When replying, please edit your Subject line so it is more specific than "Re: Contents of Linux-ha-cvs digest..." Today's Topics: 1. Linux-HA CVS: lib by sunjd from (linux-ha-cvs@lists.linux-ha.org) 2. Linux-HA CVS: lib by sunjd from (linux-ha-cvs@lists.linux-ha.org) 3. Linux-HA CVS: resources by lars from (linux-ha-cvs@lists.linux-ha.org) ---------------------------------------------------------------------- Message: 1 Date: Thu, 18 May 2006 23:52:41 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: lib by sunjd from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : sunjd Host : Project : linux-ha Module : lib Dir : linux-ha/lib/plugins/lrm Modified Files: raexechb.c Log Message: add more helpful information to metadata =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/lrm/raexechb.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -3 -r1.51 -r1.52 --- raexechb.c 16 May 2006 10:20:53 -0000 1.51 +++ raexechb.c 19 May 2006 05:52:40 -0000 1.52 @@ -58,7 +58,7 @@ "<parameters>\n" "<parameter name=\"1\" unique=\"1\" required=\"0\">\n" "<longdesc lang=\"en\">\n" -"This argument will be passed as the first argument to the" +"This argument will be passed as the first argument to the " "heartbeat resource agent (assuming it supports one)\n" "</longdesc>\n" "<shortdesc lang=\"en\">argv[1]</shortdesc>\n" @@ -66,12 +66,36 @@ "</parameter>\n" "<parameter name=\"2\" unique=\"1\" required=\"0\">\n" "<longdesc lang=\"en\">\n" -"This argument will be passed as the first argument to the" +"This argument will be passed as the second argument to the " "heartbeat resource agent (assuming it supports one)\n" "</longdesc>\n" "<shortdesc lang=\"en\">argv[2]</shortdesc>\n" "<content type=\"string\" default=\" \" />\n" "</parameter>\n" +"<parameter name=\"3\" unique=\"1\" required=\"0\">\n" +"<longdesc lang=\"en\">\n" +"This argument will be passed as the third argument to the " +"heartbeat resource agent (assuming it supports one)\n" +"</longdesc>\n" +"<shortdesc lang=\"en\">argv[3]</shortdesc>\n" +"<content type=\"string\" default=\" \" />\n" +"</parameter>\n" +"<parameter name=\"4\" unique=\"1\" required=\"0\">\n" +"<longdesc lang=\"en\">\n" +"This argument will be passed as the fourth argument to the " +"heartbeat resource agent (assuming it supports one)\n" +"</longdesc>\n" +"<shortdesc lang=\"en\">argv[4]</shortdesc>\n" +"<content type=\"string\" default=\" \" />\n" +"</parameter>\n" +"<parameter name=\"5\" unique=\"1\" required=\"0\">\n" +"<longdesc lang=\"en\">\n" +"This argument will be passed as the fifth argument to the " +"heartbeat resource agent (assuming it supports one)\n" +"</longdesc>\n" +"<shortdesc lang=\"en\">argv[5]</shortdesc>\n" +"<content type=\"string\" default=\" \" />\n" +"</parameter>\n" "</parameters>\n" "<actions>\n" "<action name=\"start\" timeout=\"15\" />\n" ------------------------------ Message: 2 Date: Fri, 19 May 2006 00:23:17 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: lib by sunjd from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : sunjd Host : Project : linux-ha Module : lib Dir : linux-ha/lib/plugins/stonith Modified Files: ibmhmc.c apcsmart.c Log Message: make the description break into lines =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/stonith/ibmhmc.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- ibmhmc.c 14 Dec 2005 18:51:52 -0000 1.25 +++ ibmhmc.c 19 May 2006 06:23:16 -0000 1.26 @@ -724,17 +724,17 @@ ret = "IBM Hardware Management Console (HMC)\n" "Use for IBM i5, p5, pSeries and OpenPower systems " "managed by HMC\n" - "Optional parameter name " ST_MANSYSPAT " is " - "white-space delimited list of patterns used to match " - "managed system names; if last character is '*', all " + "Optional parameter name " ST_MANSYSPAT " is \n" + "white-space delimited list of patterns used to match\n" + "managed system names; if last character is '*', all\n" "names that begin with the pattern are matched.\n" - "Optional parameter name " ST_PASSWD " is password " - "for " HMCROOT " if passwordless ssh access to HMC " - "has NOT been setup (to do so, it is necessary to " - "create a public/private key pair with empty " - "passphrase - see \"Configure the OpenSSH Client\" in " - "the redbook at " HMCURL " for more details); note " - "that passwordless ssh access to HMC must be setup " + "Optional parameter name " ST_PASSWD " is password\n" + "for " HMCROOT " if passwordless ssh access to HMC\n " + "has NOT been setup (to do so, it is necessary to\n " + "create a public/private key pair with empty\n " + "passphrase - see \"Configure the OpenSSH Client\" in\n" + "the redbook at " HMCURL " for more details); note\n" + "that passwordless ssh access to HMC must be setup\n " "for R1 clusters."; break; =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/stonith/apcsmart.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- apcsmart.c 9 Nov 2005 20:15:35 -0000 1.30 +++ apcsmart.c 19 May 2006 06:23:16 -0000 1.31 @@ -1,4 +1,4 @@ -/* $Id: apcsmart.c,v 1.30 2005/11/09 20:15:35 blaschke Exp $ */ +/* $Id: apcsmart.c,v 1.31 2006/05/19 06:23:16 sunjd Exp $ */ /* * Stonith module for APCSmart Stonith device * Copyright (c) 2000 Andreas Piesk <[EMAIL PROTECTED]> @@ -931,12 +931,12 @@ break; case ST_DEVICEDESCR: - ret = "APC Smart UPS" - " (via serial port - NOT USB!). " - " Works with higher-end APC UPSes, like" - " Back-UPS Pro, Smart-UPS, Matrix-UPS, etc. " - " (Smart-UPS may have to be >= Smart-UPS 700?). " - " See http://us1.networkupstools.org/protocols/apcsmart.html" + ret = "APC Smart UPS\n" + " (via serial port - NOT USB!). \n" + " Works with higher-end APC UPSes, like\n" + " Back-UPS Pro, Smart-UPS, Matrix-UPS, etc.\n" + " (Smart-UPS may have to be >= Smart-UPS 700?).\n" + " See http://us1.networkupstools.org/protocols/apcsmart.html\n" " for protocol compatibility details."; break; ------------------------------ Message: 3 Date: Fri, 19 May 2006 06:50:07 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: resources by lars from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : lars Host : Project : linux-ha Module : resources Dir : linux-ha/resources/OCF Modified Files: Filesystem.in Log Message: Further fixes from Jo, cleaned up by lmb. =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Filesystem.in,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- Filesystem.in 18 May 2006 15:28:35 -0000 1.19 +++ Filesystem.in 19 May 2006 12:50:06 -0000 1.20 @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: Filesystem.in,v 1.19 2006/05/18 15:28:35 lars Exp $ +# $Id: Filesystem.in,v 1.20 2006/05/19 12:50:06 lars Exp $ # # Support: [EMAIL PROTECTED] # License: GNU General Public License (GPL) @@ -95,7 +95,7 @@ usage() { cat <<-EOT usage: $0 {start|stop|status|monitor|validate-all|meta-data} - $Id: Filesystem.in,v 1.19 2006/05/18 15:28:35 lars Exp $ + $Id: Filesystem.in,v 1.20 2006/05/19 12:50:06 lars Exp $ EOT } @@ -422,7 +422,7 @@ done else ocf_log info "$OCFS2_UUID: Doesn't exist yet, creating." - mkdir -p $OCFS2_UUID + mkdir -p $OCFS2_FS_ROOT fi ocf_log debug "$OCFS2_UUID: Nodes which already exist: $n_exists" @@ -439,7 +439,7 @@ ocf_log warn "$OCFS2_UUID: Adding nodes on stop" fi ocf_log info "$OCFS2_UUID: Activating node: $entry" - if ! ln -s $OCFS2_CLUSTER_ROOT/node/$entry $OCFS2_UUID/$entry ; then + if ! ln -s $OCFS2_CLUSTER_ROOT/node/$entry $OCFS2_FS_ROOT/$entry ; then ocf_log err "$OCFS2_CLUSTER_ROOT/node/$entry: failed to link" # exit $OCF_ERR_GENERIC fi @@ -567,7 +567,7 @@ case "$OP" in status) ocf_log info "$msg";; esac - return_master $rc + return $rc } # end of Filesystem_status ------------------------------ _______________________________________________ Linux-ha-cvs mailing list Linux-ha-cvs@lists.linux-ha.org http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs End of Linux-ha-cvs Digest, Vol 30, Issue 59 ********************************************