change ip route add to route add -net since this works more reliably

update the makefile and rpm to install 99.routing

diff --git a/Makefile.in b/Makefile.in
index cf1240b1f71af90ac27d5c75264e6485687827a4..98ab197305d9df46381dba006b815e7c01ac2d35 100755 (executable)
--- 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 dd0a6c34bdd462bc9a64d69445549be595823467..ec0a7bf29c3267f849f363d30ad04e57483d894e 100755 (executable)
--- 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 1e1cf22eddff83d91a71b53ca6be7d25db309314..a9807e0358c4a958eaec34d26ef17336532de0d8 100644 (file)
--- 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