summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-12-27 11:55:56 +0100
committerGitHub <noreply@github.com>2022-12-27 11:55:56 +0100
commitf8f52fc4ad5f738a1b95727e407f4b6f736292b2 (patch)
tree7e0d98202ee56700bc10e246096695729dcb7a44
parentd13fe84487444c8a71fbbb7623ae81b6a2edb83d (diff)
parentea802233e3da193a689b1690cc9026fd927cb6fa (diff)
downloadvyatta-cfg-quagga-f8f52fc4ad5f738a1b95727e407f4b6f736292b2.tar.gz
vyatta-cfg-quagga-f8f52fc4ad5f738a1b95727e407f4b6f736292b2.zip
Merge pull request #98 from vfreex/T4896-ospfv3
T4896: ospfv3: Fix broken not-advertise option
-rw-r--r--templates/protocols/ospfv3/area/node.tag/range/node.def25
1 files changed, 10 insertions, 15 deletions
diff --git a/templates/protocols/ospfv3/area/node.tag/range/node.def b/templates/protocols/ospfv3/area/node.tag/range/node.def
index de886a72..83d0dc1f 100644
--- a/templates/protocols/ospfv3/area/node.tag/range/node.def
+++ b/templates/protocols/ospfv3/area/node.tag/range/node.def
@@ -3,18 +3,13 @@ type: ipv6net
help: Specify IPv6 prefix (border routers only)
syntax:expression: exec "ipaddrcheck --verbose --is-ipv6-net $VAR(@)"
-delete: touch /tmp/ospf6-range.$PPID
-
-end: if [ -f /tmp/ospf6-range.$PPID ]; then
- vtysh -c "configure terminal" \
- -c "router ospf6" \
- -c "no area $VAR(../@) range $VAR(@)";
- rm /tmp/ospf6-range.$PPID;
- else
- vtysh --noerror -c "configure terminal" \
- -c "router ospf6" \
- -c "no area $VAR(../@) range $VAR(@)";
- vtysh -c "configure terminal" \
- -c "router ospf6" \
- -c "area $VAR(../@) range $VAR(@)";
- fi;
+create: if [ -z $VAR(./not-advertise/@) ] && [ -z $VAR(./advertise/@) ]; then
+ vtysh -c "configure terminal" \
+ -c "router ospf6" \
+ -c "area $VAR(../@) range $VAR(@)"; \
+ fi;
+delete: if [ -z $VAR(./not-advertise/@) ] && [ -z $VAR(./advertise/@) ]; then
+ vtysh -c "configure terminal" \
+ -c "router ospf6" \
+ -c "no area $VAR(../@) range $VAR(@)"; \
+ fi;