[SCM] CTDB repository - branch master updated - ctdb-1.0.60-2-gc0b3bd8

Ronnie Sahlberg sahlberg at samba.org
Tue Oct 14 14:52:41 GMT 2008


The branch, master has been updated
       via  c0b3bd8a3fa580dca5afa97c8012fccb25231373 (commit)
      from  77ed0d71b1fb8d06d70d01a8e8f9eb04ffe7f02f (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c0b3bd8a3fa580dca5afa97c8012fccb25231373
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Oct 15 01:49:19 2008 +1100

    change ip route add to route add -net  since this works more reliably
    
    update the makefile and rpm to install 99.routing

-----------------------------------------------------------------------

Summary of changes:
 Makefile.in                |    1 +
 config/events.d/99.routing |    2 +-
 packaging/RPM/ctdb.spec    |    1 +
 3 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/Makefile.in b/Makefile.in
index cf1240b..98ab197 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -197,6 +197,7 @@ install: all
 	${INSTALLCMD} -m 755 config/events.d/70.iscsi $(DESTDIR)$(etcdir)/ctdb/events.d
 	${INSTALLCMD} -m 755 config/events.d/90.ipmux $(DESTDIR)$(etcdir)/ctdb/events.d
 	${INSTALLCMD} -m 755 config/events.d/91.lvs $(DESTDIR)$(etcdir)/ctdb/events.d
+	${INSTALLCMD} -m 755 config/events.d/99.routing $(DESTDIR)$(etcdir)/ctdb/events.d
 	${INSTALLCMD} -m 755 tools/ctdb_diagnostics $(DESTDIR)$(bindir)
 	${INSTALLCMD} -m 755 tools/onnode $(DESTDIR)$(bindir)
 	if [ -f doc/ctdb.1 ];then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man1; fi
diff --git a/config/events.d/99.routing b/config/events.d/99.routing
index dd0a6c3..ec0a7bf 100755
--- a/config/events.d/99.routing
+++ b/config/events.d/99.routing
@@ -27,7 +27,7 @@ case $cmd in
      takeip)
 	iface=$1
 	cat $CTDB_BASE/static-routes | egrep "^$iface " | while read IFACE DEST GW; do
-		ip route add $DEST via $GW 2>/dev/null >/dev/null
+		route add -net $DEST gw $GW
 	done
 
 	;;
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index 1e1cf22..a9807e0 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -104,6 +104,7 @@ fi
 %{_sysconfdir}/ctdb/events.d/70.iscsi
 %{_sysconfdir}/ctdb/events.d/90.ipmux
 %{_sysconfdir}/ctdb/events.d/91.lvs
+%{_sysconfdir}/ctdb/events.d/99.routing
 %{_sysconfdir}/ctdb/statd-callout
 %{_sbindir}/ctdbd
 %{_bindir}/ctdb


-- 
CTDB repository


More information about the samba-cvs mailing list