Merge branch 'current' of https://github.com/vyos/vyatta-cfg-quagga into current

Conflicts:
	debian/control

35 files changed, 42 insertions, 76 deletions

diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/access-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/access-list/node.def
deleted file mode 100644
index 18b6a1ce..00000000
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/access-list/node.def
+++ /dev/null
@@ -1,15 +0,0 @@
-type: txt
-help: IPv6 access-list6 to match
-val_help: IPv6 access list
-
-commit:expression: $VAR(../prefix-list/) == ""; "you may only specify a prefix-list or access-list"
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list6 $VAR(@)\" "; "access-list6 $VAR(@) does not exist"
-commit:expression: $VAR(../../../../action/) != ""; "you must specify an action"
-
-update: vtysh -c "configure terminal" \
-         -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \
-         -c "match ipv6 next-hop $VAR(@)"
-
-delete: vtysh -c "configure terminal" \
-         -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \
-         -c "no match ipv6 next-hop $VAR(@)"
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/node.def
index 31b6bd93..b5757965 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/node.def
@@ -1 +1,11 @@
-help: IP next-hop of route to match
+help: IPv6 next-hop of route to match
+type: ipv6
+val_help: next-hop ipv6 address IPv6
+
+update: vtysh -c "configure terminal" \
+          -c "route-map $VAR(../../../../@) $VAR(../../../action/@) $VAR(../../../@)" \
+          -c "match ipv6 next-hop $VAR(@)"
+
+delete: vtysh -c "configure terminal" \
+          -c "route-map $VAR(../../../../@) $VAR(../../../action/@) $VAR(../../../@)" \
+          -c "no match ipv6 next-hop $VAR(@)"
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/prefix-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/prefix-list/node.def
deleted file mode 100644
index ec9a4d2f..00000000
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/prefix-list/node.def
+++ /dev/null
@@ -1,15 +0,0 @@
-type: txt
-help: IPv6 prefix-list to match
-val_help: IPv6 prefix list name
-
-commit:expression: $VAR(../access-list/) == ""; "you can only specify a prefix-list or access-list"
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" "; "prefix-list $VAR(@) does not exist"
-commit:expression: $VAR(../../../../action/) != ""; "you must specify an action"
-
-update: vtysh -c "configure terminal" \
-         -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \
-         -c "match ipv6 next-hop prefix-list $VAR(@)"
-
-delete: vtysh -c "configure terminal" \
-         -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \
-         -c "no match ipv6 next-hop prefix-list $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/node.def
index e0699608..327872ac 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/node.def
@@ -1 +1 @@
-help: Accept a route that contains the local-AS in the as-path
+help: Accept a IPv4-route that contains the local-AS in the as-path
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/number/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/number/node.def
index 857b7b98..db60c0a3 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/number/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/number/node.def
@@ -1,4 +1,4 @@
 type: u32
-help: Number of occurrences of AS number
+help: Number of occurrences of AS number (IPv4)
 val_help: u32:1-10; Number of times AS is allowed in path
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10; "allowas-in number must be between 1 and 10"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/as-path/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/as-path/node.def
index b2a2a898..a3a9c592 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/as-path/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/as-path/node.def
@@ -1 +1 @@
-help: Send AS path unchanged
+help: Send AS path unchanged (IPv4)
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/med/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/med/node.def
index c70212cb..b64026bb 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/med/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/med/node.def
@@ -1 +1 @@
-help: Send multi-exit discriminator unchanged
+help: Send multi-exit discriminator unchanged (IPv4)
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/next-hop/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/next-hop/node.def
index a67c9fec..23ec4621 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/next-hop/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/next-hop/node.def
@@ -1 +1 @@
-help: Send nexthop unchanged
+help: Send nexthop unchanged (IPv4)
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def
index d1135a3a..25055d48 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def
@@ -1 +1 @@
-help: BGP attributes are sent unchanged
+help: BGP attributes are sent unchanged (IPv4)
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/node.def
index 1a9583b2..0a1fc867 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/node.def
@@ -1 +1 @@
-help: Advertise capabilities to this neighbor
+help: Advertise capabilities to this neighbor (IPv4)
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/node.def
index bdbdbd66..adcb3f5e 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/node.def
@@ -1 +1 @@
-help: Send default route to this neighbor
+help: Send default IPv4-route to this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/route-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/route-map/node.def
index 689451ce..e035518f 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/route-map/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Route-map to specify criteria of the default
+help: IPv4-Route-map to specify criteria of the default
 allowed: local -a params
         params=$(/opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map)
         echo -n ${params[@]##*/}
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def
index 84fc317b..5a33b6c1 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def
@@ -1 +1 @@
-help: Disable sending extended community attributes to this neighbor
+help: Disable sending extended community attributes to this neighbor (IPv4)
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/node.def
index 2fd803db..0d915212 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/node.def
@@ -1,2 +1,2 @@
-help: Disable sending community attributes to this neighbor
+help: Disable sending community attributes to this neighbor (IPv4)
 commit:expression: ($VAR(./extended/) != "") || ($VAR(./standard/) != ""); "you must specify the type of community"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def
index 9734ae9b..a762aac5 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def
@@ -1 +1 @@
-help: Disable sending standard community attributes to this neighbor
+help: Disable sending standard community attributes to this neighbor (IPv4)
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def
index 6e1360a5..c7414d02 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def
@@ -1,5 +1,5 @@
 type: u32
-help: Access-list to filter outgoing route updates to this neighbor
+help: Access-list to filter outgoing IPv4-route updates to this neighbor
 val_help: u32:1-65535; Access list number
 
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Access list must be between 1 and 65535"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def
index 05c38e66..00c6fa38 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def
@@ -1,5 +1,5 @@
 type: u32
-help: Access-list to filter incoming route updates from this neighbor
+help: Access-list to filter incoming IPv4-route updates from this neighbor
 val_help: u32:1-65535; Access-list number
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Access list must be between 1 and 65535"
 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/node.def
index 28cf509a..4c25b408 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/node.def
@@ -1 +1 @@
-help: Access-list to filter route updates to/from this neighbor
+help: Access-list to filter IPv4-route updates to/from this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/export/node.def
index 30c0335e..8c0824ec 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/export/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: As-path-list to filter outgoing route updates to this neighbor
+help: As-path-list to filter outgoing IPv4-route updates to this neighbor
 allowed: local -a params
         params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list )
         echo -n ${params[@]##*/}
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/import/node.def
index 2626dfb4..5643a595 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/import/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: As-path-list to filter incoming route updates from this neighbor
+help: As-path-list to filter incoming IPv4-route updates from this neighbor
 allowed: local -a params
         params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list )
         echo -n ${params[@]##*/}
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/node.def
index 28294cb2..f9ab180f 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/node.def
@@ -1 +1 @@
-help: As-path-list to filter route updates to/from this neighbor
+help: As-path-list to filter IPv4-route updates to/from this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/maximum-prefix/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/maximum-prefix/node.def
index 781a8752..1848bb25 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/maximum-prefix/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/maximum-prefix/node.def
@@ -1,4 +1,4 @@
 type: u32
-help: Maximum number of prefixes to accept from this neighbor
+help: Maximum number of IPv4-prefixes to accept from this neighbor
 val_help: u32:1-4294967295; Prefix limit
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967295; "maximum-prefix must be between 1 and 4294967295"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/nexthop-self/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/nexthop-self/node.def
index 7b00a8f8..175b9772 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/nexthop-self/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/nexthop-self/node.def
@@ -1 +1 @@
-help: Nexthop for routes sent to this neighbor to be the local router
+help: Nexthop for IPv4-routes sent to this neighbor to be the local router
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def
index 8e84af9d..e5b0283b 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Prefix-list to filter outgoing route updates to this neighbor
+help: IPv4-Prefix-list to filter outgoing route updates to this neighbor
 allowed: local -a params
         params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list )
         echo -n ${params[@]##*/}
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def
index 4abad9c9..111f0f8a 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Prefix-list to filter incoming route updates from this neighbor
+help: IPv4-Prefix-list to filter incoming route updates from this neighbor
 allowed: local -a params
         params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list )
         echo -n ${params[@]##*/}
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/node.def
index 9ea11cad..7d277fee 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/node.def
@@ -1 +1 @@
-help: Prefix-list to filter route updates to/from this neighbor
+help: IPv4-Prefix-list to filter route updates to/from this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/remove-private-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/remove-private-as/node.def
index 2ea415d6..091b13b1 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/remove-private-as/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/remove-private-as/node.def
@@ -1,2 +1,2 @@
-help: Remove private AS numbers from AS path in outbound route updates
+help: Remove private AS numbers from AS path in outbound IPv4-route updates
 commit:expression: $VAR(../remote-as/@) != $VAR(../../@); "you can't set remove-private-as for an iBGP peer"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def
index c7dfdb10..aa5aeac7 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Route-map to filter outgoing route updates to this neighbor
+help: IPv4-Route-map to filter outgoing route updates to this neighbor
 allowed: local -a params
         params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
         echo -n ${params[@]##*/}
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def
index 86bc18f9..ffb37b56 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Route-map to filter incoming route updates from this neighbor
+help: IPv4-Route-map to filter incoming route updates from this neighbor
 allowed: local -a params
         params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
         echo -n ${params[@]##*/}
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/node.def
index d1439e74..cfba75c3 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/node.def
@@ -1 +1 @@
-help: Route-map to filter route updates to/from this neighbor
+help: Route-map to filter IPv4-route updates to/from this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def
index a6807c90..b23ae677 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def
@@ -1,2 +1,2 @@
-help: Neighbor as a route reflector client
+help: Neighbor as a IPv4-route reflector client
 commit:expression: $VAR(../../@) == $VAR(../remote-as/@); "remote-as must equal local-as"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def
index 9a959976..ceb76c5f 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def
@@ -1 +1 @@
-help: Neighbor is route server client
+help: Neighbor is IPv4-route server client
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/node.def
index 6e31f108..d097ab10 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/node.def
@@ -1,2 +1,2 @@
-help: Soft reconfiguration for neighbor
+help: Soft reconfiguration for neighbor (IPv4)
 commit:expression: $VAR(./inbound/) != ""; "you must specify the type of soft-reconfiguration"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def
index 0f1602b2..a8dc3148 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Route-map to selectively unsuppress suppressed routes
+help: Route-map to selectively unsuppress suppressed IPv4-routes
 allowed: local -a params
         params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map )
         echo -n ${params[@]##*/}
diff --git a/templates/system/gateway-address/node.def b/templates/system/gateway-address/node.def
deleted file mode 100644
index 70419e26..00000000
--- a/templates/system/gateway-address/node.def
+++ /dev/null
@@ -1,14 +0,0 @@
-priority: 400
-type: ipv4
-help: Default gateway
-create: vtysh -c "configure terminal" -c "ip route 0.0.0.0/0 $VAR(@)"
-update: oldgw=`/opt/vyatta/sbin/vyatta-cli-expand-var.pl \\$VAR\(/system/gateway-address/@\)`
-	if [ -n "$oldgw" ]; then
-            vtysh --noerror -c "configure terminal" \
-                      -c "no ip route 0.0.0.0/0 $oldgw"
-        fi
-        vtysh -c "configure terminal" -c "ip route 0.0.0.0/0 $VAR(@)"
-delete: if ${vyatta_sbindir}/vyatta-gateway-static_route-check.pl "$VAR(@)"
-	then vtysh -c "configure terminal" -c "no ip route 0.0.0.0/0 $VAR(@)"
-	fi
-end: ${vyatta_sbindir}/vyatta-gateway-static_route-check.pl warn