summaryrefslogtreecommitdiff
path: root/templates/system
diff options
context:
space:
mode:
authorJohn Southworth <john.southworth@vyatta.com>2011-05-12 18:55:41 -0500
committerJohn Southworth <john.southworth@vyatta.com>2011-05-12 18:55:41 -0500
commit514125a2246ee477809a325a7661be08a15c8482 (patch)
tree304dace26fd27f14cc8f25347b2cab2cf95fdd8e /templates/system
parent81731da16519e452ab2d4eb913ee01e5468a1905 (diff)
parent0a59c2f58a44f1caf4304429ace5d2d76d8867b8 (diff)
downloadvyatta-cfg-system-514125a2246ee477809a325a7661be08a15c8482.tar.gz
vyatta-cfg-system-514125a2246ee477809a325a7661be08a15c8482.zip
Merge branch 'napa' of git.vyatta.com:/git/vyatta-cfg-system into napa
Diffstat (limited to 'templates/system')
-rw-r--r--templates/system/ipv6/blacklist/node.def1
-rw-r--r--templates/system/ipv6/disable-forwarding/node.def1
-rw-r--r--templates/system/ipv6/disable/node.def1
-rw-r--r--templates/system/ipv6/neighbor/node.def1
-rw-r--r--templates/system/ipv6/node.def1
-rw-r--r--templates/system/node.def1
6 files changed, 4 insertions, 2 deletions
diff --git a/templates/system/ipv6/blacklist/node.def b/templates/system/ipv6/blacklist/node.def
index ce8dafd1..081425bd 100644
--- a/templates/system/ipv6/blacklist/node.def
+++ b/templates/system/ipv6/blacklist/node.def
@@ -1,3 +1,4 @@
+priority: 400
help: Prevent the IPv6 kernel module from being loaded
create:
diff --git a/templates/system/ipv6/disable-forwarding/node.def b/templates/system/ipv6/disable-forwarding/node.def
index 4d374455..10357338 100644
--- a/templates/system/ipv6/disable-forwarding/node.def
+++ b/templates/system/ipv6/disable-forwarding/node.def
@@ -1,3 +1,4 @@
+priority: 400
help: Disable IPv6 forwarding on all interfaces
# Disable IPv6 forwarding for all interfaces we currently have,
diff --git a/templates/system/ipv6/disable/node.def b/templates/system/ipv6/disable/node.def
index be1ce2f5..eb61557f 100644
--- a/templates/system/ipv6/disable/node.def
+++ b/templates/system/ipv6/disable/node.def
@@ -1,3 +1,4 @@
+priority: 400
help: Disable assignment of IPv6 addresses on all interfaces
create:
diff --git a/templates/system/ipv6/neighbor/node.def b/templates/system/ipv6/neighbor/node.def
index ed434588..ca609636 100644
--- a/templates/system/ipv6/neighbor/node.def
+++ b/templates/system/ipv6/neighbor/node.def
@@ -1 +1,2 @@
+priority: 400
help: Parameters for Neighbor cache
diff --git a/templates/system/ipv6/node.def b/templates/system/ipv6/node.def
index 4801c82d..d67a124a 100644
--- a/templates/system/ipv6/node.def
+++ b/templates/system/ipv6/node.def
@@ -1,2 +1 @@
-priority: 400
help: IPv6 settings
diff --git a/templates/system/node.def b/templates/system/node.def
index 156b6317..5a6953a7 100644
--- a/templates/system/node.def
+++ b/templates/system/node.def
@@ -1,2 +1 @@
-priority: 405
help: System parameters