diff options
| author | Stig Thormodsrud <stig@io.vyatta.com> | 2009-03-04 14:00:22 -0800 |
|---|---|---|
| committer | Stig Thormodsrud <stig@io.vyatta.com> | 2009-03-04 14:00:22 -0800 |
| commit | 8afc28e1b8a50cd75b56556ee3d63aeeecbe3127 (patch) | |
| tree | efc1f8d84bbf2693ae61f3fe8aa11a4f1c82d22c /templates | |
| parent | ee405d16c10bb604de3e186499d5cf9a37f53403 (diff) | |
| parent | cb9c343db46dd15b734e477d9adba343827e0360 (diff) | |
| download | vyatta-cfg-quagga-8afc28e1b8a50cd75b56556ee3d63aeeecbe3127.tar.gz vyatta-cfg-quagga-8afc28e1b8a50cd75b56556ee3d63aeeecbe3127.zip | |
Merge branch 'jenner' of http://git.vyatta.com/vyatta-cfg-quagga into jenner
Diffstat (limited to 'templates')
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 7582362d..c22c9305 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 @@ -7,12 +7,10 @@ allowed: local -a array array=( /sys/class/net/* ) echo -n ${array[@]##*/} -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 5321c619..a7e1744a 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 @@ -7,12 +7,9 @@ allowed: local -a array array=( /sys/class/net/* ) echo -n ${array[@]##*/} -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/@)"; |