ctdb-scripts: Quote some variable expansions

[nivanova/samba-autobuild/.git] / ctdb / config / events.d / 11.routing

diff --git a/ctdb/config/events.d/11.routing b/ctdb/config/events.d/11.routing
index b6093a2a43829afb6772f27d708dd4093b005917..87c0027124bdd4bd56c968c84f33667134f966f5 100755 (executable)
--- a/ctdb/config/events.d/11.routing
+++ b/ctdb/config/events.d/11.routing
@@ -1,40 +1,48 @@
 #!/bin/sh
-# script to add entries to the routing table after we have performed a
-# take ip event
-# (when we do a "releaseip" event and remove an ip address from an interface
-#  the kernel might automatically remove associated entries from
-#  the routing table. This is where we add them back)
+
+# Attempt to add a set of static routes.
+#
+# Do this in "ipreallocated" rather than just "startup" because some
+# of the routes might be missing because the corresponding interface
+# has not previously had any IPs assigned or IPs were previously
+# released and corresponding routes were dropped.
+#
+# Addition of some routes might fail, errors go to /dev/null.
+#
+# Routes to add are defined in $CTDB_BASE/static-routes. Syntax is:
 #
-# Routes to add are defined in /etc/ctdb/static-routes.
-# Syntax is :
 # IFACE NET/MASK GATEWAY
 #
-# Example
+# Example:
+#
 # bond1 10.3.3.0/24 10.0.0.1
 
-. $CTDB_BASE/functions
+[ -n "$CTDB_BASE" ] || \
+    CTDB_BASE=$(d=$(dirname "$0") ; cd -P "$d" ; dirname "$PWD")
+
+. "${CTDB_BASE}/functions"
+
 loadconfig
 
-[ -f $CTDB_BASE/static-routes ] || {
+[ -f "${CTDB_BASE}/static-routes" ] || {
     exit 0
 }
 
 case "$1" in
-    recovered|ipreallocated)
-        cat $CTDB_BASE/static-routes | while read IFACE DEST GW; do
-            ip route add $DEST via $GW dev $IFACE >/dev/null 2>/dev/null
-        done
+    ipreallocated)
+        while read iface dest gw; do
+            ip route add "$dest" via "$gw" dev "$iface" >/dev/null 2>&1
+        done <"${CTDB_BASE}/static-routes"
         ;;
 
     updateip)
        oiface=$2
        niface=$3
-       cat $CTDB_BASE/static-routes | egrep "^$niface " | while read IFACE DEST GW; do
-           ip route add $DEST via $GW dev $IFACE >/dev/null 2>/dev/null
-       done
-       cat $CTDB_BASE/static-routes | egrep "^$oiface " | while read IFACE DEST GW; do
-           ip route add $DEST via $GW dev $IFACE >/dev/null 2>/dev/null
-       done
+       while read iface dest gw; do
+           if [ "$niface" = "$iface" -o "$oiface" = "$iface" ] ; then
+               ip route add "$dest" via "$gw" dev "$iface" >/dev/null 2>&1
+           fi
+       done <"${CTDB_BASE}/static-routes"
        ;;
 
     *)