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: resources by msoffen from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: linux-ha by msoffen from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: ldirectord by msoffen from
(linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: linux-ha by msoffen from
(linux-ha-cvs@lists.linux-ha.org)
5. Linux-HA CVS: lib by msoffen from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Mon, 14 Aug 2006 13:56:30 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by msoffen from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : msoffen
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
.cvsignore
Log Message:
Added Stateful.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- .cvsignore 9 Aug 2006 13:55:51 -0000 1.8
+++ .cvsignore 14 Aug 2006 19:56:30 -0000 1.9
@@ -15,6 +15,7 @@
Raid1
SendArp
ServeRAID
+Stateful
WAS
WinPopup
IPsrcaddr
------------------------------
Message: 2
Date: Mon, 14 Aug 2006 13:58:54 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by msoffen from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : msoffen
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
bootstrap
Log Message:
Fixing problem where it links auto progs to the local directory.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/bootstrap,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- bootstrap 7 Aug 2006 15:43:10 -0000 1.31
+++ bootstrap 14 Aug 2006 19:58:54 -0000 1.32
@@ -134,8 +134,8 @@
fi
# Create local copy so that the incremental updates will work.
-rm -f $autoconf ./autoconf
-ln -s $autoconf ./autoconf
+rm -f ./autoconf
+ln -s `which $autoconf` ./autoconf
# Check for automake
pkg="automake"
@@ -168,8 +168,8 @@
fi
# Create local copy so that the incremental updates will work.
-rm -f $automake ./automake
-ln -s $automake ./automake
+rm -f ./automake
+ln -s `which $automake` ./automake
# Check for Libtool
pkg="libtool"
@@ -201,8 +201,8 @@
fi
# Create local copy so that the incremental updates will work.
-rm -f $libtool ./libtool
-ln -s $libtool ./libtool
+rm -f ./libtool
+ln -s `which $libtool` ./libtool
case $RC in
0) ;;
@@ -277,8 +277,8 @@
$aclocal $ACLOCAL_FLAGS
# Create local copy so that the incremental updates will work.
-rm -f $autoheader ./autoheader
-ln -s $autoheader ./autoheader
+rm -f ./autoheader
+ln -s `which $autoheader` ./autoheader
if
echo $autoheader --version < /dev/null > /dev/null 2>&1
------------------------------
Message: 3
Date: Mon, 14 Aug 2006 13:59:35 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: ldirectord by msoffen from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : msoffen
Host :
Project : linux-ha
Module : ldirectord
Dir : linux-ha/ldirectord
Added Files:
ldirectord.in
Removed Files:
ldirectord
Log Message:
Changed ldirectord to a automade file.
------------------------------
Message: 4
Date: Mon, 14 Aug 2006 14:00:55 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by msoffen from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : msoffen
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
Fixed so that SSH and REBOOT are taken from the config settings.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.546
retrieving revision 1.547
diff -u -3 -r1.546 -r1.547
--- configure.in 14 Aug 2006 13:13:33 -0000 1.546
+++ configure.in 14 Aug 2006 20:00:55 -0000 1.547
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.546 $) dnl cvs revision
+AC_REVISION($Revision: 1.547 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -54,22 +54,27 @@
*bsd*) LIBS="-L/usr/local/lib"
CPPFLAGS="$CPPFLAGS -I/usr/local/include"
INIT_EXT=".sh"
+ REBOOT_OPTIONS="-f"
;;
*solaris*)
pf_argv_set="PF_ARGV_NONE"
+ REBOOT_OPTIONS="-f"
;;
*linux*) USE_MODULES=1
+ REBOOT_OPTIONS="-nf"
;;
dnl anything?
darwin*)
AC_DEFINE_UNQUOTED(ON_DARWIN, 1, Compiling for Darwin platform)
+ REBOOT_OPTIONS="-f"
;;
esac
AC_SUBST(INIT_EXT)
AC_SUBST(USE_MODULES)
+AC_SUBST(REBOOT_OPTIONS)
dnl Info for building/packaging systems.
dnl
@@ -421,6 +426,8 @@
AC_PATH_PROGS(IP2UTIL, ip)
AC_PATH_PROGS(IPTABLES, iptables)
AC_PATH_PROGS(XML2CONFIG, xml2-config)
+AC_PATH_PROGS(REBOOT, reboot)
+AC_SUBST(REBOOT)
dnl "whoami", if it exists, may be hidden away on some System-V (e.g. Solaris)
AC_PATH_PROGS(WHOAMI, whoami, , ${PATH}:/usr/ucb)
AC_PATH_PROGS(STRINGSCMD, strings)
@@ -682,6 +689,7 @@
done
AC_SUBST(PING_TIMEOUT_OPT)
+
dnl Determining a route (particularly for "findif").
dnl There are various mechanisms on different systems.
dnl Some mechanisms require root access to evaluate, but configure is often
@@ -1084,7 +1092,7 @@
fi
AC_ARG_WITH(mibsdir,
- [ --with-mibsdir=DIR directory for mib files. ],
+ [ --with-miBsdir=DIR directory for mib files. ],
[ MIBS_DIR="$withval" ])
if test "x${enable_snmp_subagent}" = "xyes" -a "X${MIBS_DIR}" = "X"; then
@@ -2726,6 +2734,7 @@
heartbeat/libnet_util/Makefile \
heartbeat/logrotate.d/Makefile \
ldirectord/Makefile \
+ldirectord/ldirectord \
ldirectord/init.d/Makefile \
ldirectord/init.d/ldirectord \
ldirectord/logrotate.d/Makefile \
------------------------------
Message: 5
Date: Mon, 14 Aug 2006 14:00:56 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by msoffen from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : msoffen
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/plugins/stonith/external
Modified Files:
ssh.in
Log Message:
Fixed so that SSH and REBOOT are taken from the config settings.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/stonith/external/ssh.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ssh.in 8 Jun 2006 09:12:25 -0000 1.10
+++ ssh.in 14 Aug 2006 20:00:55 -0000 1.11
@@ -24,10 +24,10 @@
# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
#
-#SSH_COMMAND "ssh -q -x -o PasswordAuthentication=no StrictHostKeyChecking=no"
-SSH_COMMAND="ssh -q -x -n -l root"
+#SSH_COMMAND "@SSH@ -q -x -o PasswordAuthentication=no
StrictHostKeyChecking=no"
+SSH_COMMAND="@SSH@ -q -x -n -l root"
-REBOOT_COMMAND="echo 'sleep 2; /sbin/reboot -nf' | SHELL=/bin/sh at now
>/dev/null 2>&1"
+REBOOT_COMMAND="echo 'sleep 2; @REBOOT@ @REBOOT_OPTIONS@' | SHELL=/bin/sh at
now >/dev/null 2>&1"
# Warning: If you select this poweroff command, it'll physically
# power-off the machine, and quite a number of systems won't be remotely
@@ -35,7 +35,7 @@
# TODO: Probably should touch a file on the server instead to just
# prevent heartbeat et al from being started after the reboot.
# POWEROFF_COMMAND="echo 'sleep 2; /sbin/poweroff -nf' | SHELL=/bin/sh at now
>/dev/null 2>&1"
-POWEROFF_COMMAND="echo 'sleep 2; /sbin/reboot -nf' | SHELL=/bin/sh at now
>/dev/null 2>&1"
+POWEROFF_COMMAND="echo 'sleep 2; @REBOOT@ @REBOOT_OPTIONS@' | SHELL=/bin/sh at
now >/dev/null 2>&1"
# Rewrite the hostlist to accept "," as a delimeter for hostnames too.
hostlist=`echo $hostlist | tr ',' ' '`
------------------------------
_______________________________________________
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 33, Issue 29
********************************************
