Merge branch 'jenner' of suva.vyatta.com:/git/vyatta-cfg-quagga into jenner

7 files changed, 16 insertions, 22 deletions

diff --git a/templates/protocols/ospf/passive-interface/node.def b/templates/protocols/ospf/passive-interface/node.def
index 841bd340..9db0aca8 100644
--- a/templates/protocols/ospf/passive-interface/node.def
+++ b/templates/protocols/ospf/passive-interface/node.def
@@ -1,8 +1,13 @@
 multi:
 type: txt
 help: Set to suppress routing updates on an interface
-syntax:expression: exec "${vyatta_sbindir}/vyatta-interfaces.pl --check $VAR(@)"
-allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all
+
+syntax:expression: exec "${vyatta_sbindir}/vyatta-interfaces.pl \
+                   --check all --dev $VAR(@) 2> /dev/null ||    \
+                   [ x$VAR(@) == xdefault ]";                   \
+                   "$VAR(@) is not 'default' or a known interface name"
+
+allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all && echo default
 update: if [ -z $VAR(@) ]
         then  vyatta-vtysh -c "configure terminal" -c "router ospf" \
           -c "passive-interface default";
@@ -15,3 +20,6 @@ delete: if [ -z $VAR(@) ]
 	else vyatta-vtysh -c "configure terminal" -c "router ospf" \
           -c "no passive-interface $VAR(@)"
  	fi
+comp_help: possible completions:
+  <interface>     Set an interface to be passive (i.e. suppress routing updates)
+  default         Set default to suppress routing updates on all interfaces
diff --git a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def
index e9f4f764..cd739481 100644
--- a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def
+++ b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def
@@ -5,12 +5,10 @@ help: Set the next-hop interface
 # but syntax accepts any interface since it may exist later (ppp etc)
 allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all
 
-delete: touch /tmp/static.$PPID
 
-end: if [ -f "/tmp/static.$PPID" ]; then
+end: if [ ${COMMIT_ACTION} = 'DELETE' ]; then
        vyatta-vtysh -c "configure terminal" \
                     -c "no ip route $VAR(../@) $VAR(@)";
-       rm /tmp/static.$PPID;
      else
        if [ -n "$VAR(./distance/@)" ]; then
 	  DIST="$VAR(./distance/@)";
diff --git a/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def b/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def
index 2d5eb281..052e1a2f 100644
--- a/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def
+++ b/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def
@@ -5,12 +5,9 @@ help: Set the next-hop interface
 # but syntax accepts any interface since it may exist later (ppp etc)
 allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all
 
-delete: touch /tmp/static.$PPID
-
-end: if [ -f "/tmp/static.$PPID" ]; then
+end: if [ ${COMMIT_ACTION} = 'DELETE' ]; then
         vyatta-vtysh -c "configure terminal" \
            -c "no ipv6 route $VAR(../@) $VAR(@)";
-        rm /tmp/static.$PPID;
      else 
         if [ -n "$VAR(./distance/@)" ]; then
 	   DIST="$VAR(./distance/@)";
diff --git a/templates/protocols/static/route/node.tag/blackhole/node.def b/templates/protocols/static/route/node.tag/blackhole/node.def
index f3844833..14375e0e 100644
--- a/templates/protocols/static/route/node.tag/blackhole/node.def
+++ b/templates/protocols/static/route/node.tag/blackhole/node.def
@@ -1,11 +1,8 @@
 help: Set to silently discard pkts when matched
 
-delete: touch /tmp/static.$PPID
-
-end: if [ -f "/tmp/static.$PPID" ]; then
+end: if [ ${COMMIT_ACTION} = 'DELETE' ]; then
        vyatta-vtysh -c "configure terminal" \
                     -c "no ip route $VAR(../@) null0";
-       rm /tmp/static.$PPID;
      else
        if [ -n "$VAR(./distance/@)" ]; then
 	 DIST="$VAR(./distance/@)";
diff --git a/templates/protocols/static/route/node.tag/next-hop/node.def b/templates/protocols/static/route/node.tag/next-hop/node.def
index e631df83..c8632ed8 100644
--- a/templates/protocols/static/route/node.tag/next-hop/node.def
+++ b/templates/protocols/static/route/node.tag/next-hop/node.def
@@ -1,8 +1,7 @@
 tag:
 type: ipv4
 help: Set the next-hop router
-delete: touch /tmp/static.$PPID
-end: if [[ -f /tmp/static.$PPID ]]
+end: if [[ ${COMMIT_ACTION} = 'DELETE' ]]
      then 
          if ${vyatta_sbindir}/vyatta-gateway-static_route-check.pl \
          "$VAR(../@)" "$VAR(@)"
@@ -10,7 +9,6 @@ end: if [[ -f /tmp/static.$PPID ]]
             vyatta-vtysh -c "configure terminal" \
                          -c "no ip route $VAR(../@) $VAR(@)"
          fi
-         rm -f /tmp/static.$PPID
      else
          if [[ -n "$VAR(./distance/@)" ]]
 	 then
diff --git a/templates/protocols/static/route6/node.tag/blackhole/node.def b/templates/protocols/static/route6/node.tag/blackhole/node.def
index bd8601d5..a4066ee6 100644
--- a/templates/protocols/static/route6/node.tag/blackhole/node.def
+++ b/templates/protocols/static/route6/node.tag/blackhole/node.def
@@ -1,10 +1,8 @@
 help: Set to silently discard pkts when matched
-delete:expression: "touch /tmp/static.$PPID"
 
-end: if [ -f "/tmp/static.$PPID" ]; then 
+end: if [ ${COMMIT_ACTION} = 'DELETE' ]; then 
         vyatta-vtysh -c "configure terminal" \
           -c "no ipv6 route $VAR(../@) null0";
-        rm /tmp/static.$PPID;
      else
         if [ -n "$VAR(./distance/@)" ]; then
 	   DIST="$VAR(./distance/@)";
diff --git a/templates/protocols/static/route6/node.tag/next-hop/node.def b/templates/protocols/static/route6/node.tag/next-hop/node.def
index 3f9cd440..e58c4fcc 100644
--- a/templates/protocols/static/route6/node.tag/next-hop/node.def
+++ b/templates/protocols/static/route6/node.tag/next-hop/node.def
@@ -1,12 +1,10 @@
 tag:
 type: ipv6
 help: Set the next-hop IPv6 router
-delete: touch /tmp/static.$PPID
-end: if [ -f "/tmp/static.$PPID" ]; then 
+end: if [ ${COMMIT_ACTION} = 'DELETE' ]; then 
         if ${vyatta_sbindir}/vyatta-gateway-static_route-check.pl "$VAR(../@)" "$VAR(@)"; then 
            vyatta-vtysh -c "configure terminal" -c "no ipv6 route $VAR(../@) $VAR(@)" ; 
         fi;
-        rm /tmp/static.$PPID; 
      else 
         if [ -n "$VAR(./distance/@)" ]; then
 	   DIST="$VAR(./distance/@)";