diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-03-07 13:44:45 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-03-07 13:44:45 -0800 |
| commit | a217f94c2264a681c97a7a76dabcacb8fce2a57e (patch) | |
| tree | 007791d2c30994cbbd651c814407a74fa1733ab4 /templates/protocols/static | |
| parent | da9b9d773588e20b60b46538c46f7c4e14903935 (diff) | |
| parent | cae1b1454c0961e4a1733af93ce41d3db6f4b4b8 (diff) | |
| download | vyatta-cfg-quagga-a217f94c2264a681c97a7a76dabcacb8fce2a57e.tar.gz vyatta-cfg-quagga-a217f94c2264a681c97a7a76dabcacb8fce2a57e.zip | |
Merge branch 'jenner' of suva.vyatta.com:/git/vyatta-cfg-quagga into jenner
Diffstat (limited to 'templates/protocols/static')
6 files changed, 6 insertions, 20 deletions
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/@)"; |