summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Harpin <development@landsofshadow.co.uk>2015-11-30 22:10:30 +0000
committerAlex Harpin <development@landsofshadow.co.uk>2015-11-30 22:21:57 +0000
commit27f49c1c5bc0b9656a2931c17d5092a372447c61 (patch)
treede0b337e5adfcbc134e18936c12db35430cbae3e
parent3b188bb4a2d0c014c03749ee36347a56b15b02c2 (diff)
downloadvyatta-cfg-system-27f49c1c5bc0b9656a2931c17d5092a372447c61.tar.gz
vyatta-cfg-system-27f49c1c5bc0b9656a2931c17d5092a372447c61.zip
vyatta-cfg-system: tidy up of sysctl nodes, remove extraneous nodes
Tidy up some of the sysctl nodes, with the removal of some nodes that are unnecessary. Bug #88 http://bugzilla.vyos.net/show_bug.cgi?id=88
-rw-r--r--templates/system/sysctl/all/node.tag/node.def1
-rw-r--r--templates/system/sysctl/all/node.tag/value/node.def2
-rw-r--r--templates/system/sysctl/custom/node.def4
-rw-r--r--templates/system/sysctl/custom/node.tag/node.def1
-rw-r--r--templates/system/sysctl/custom/node.tag/value/node.def5
-rw-r--r--templates/system/sysctl/net.ipv4.igmp_max_memberships/node.def8
-rw-r--r--templates/system/sysctl/net.ipv4.ipfrag_time/node.def9
7 files changed, 9 insertions, 21 deletions
diff --git a/templates/system/sysctl/all/node.tag/node.def b/templates/system/sysctl/all/node.tag/node.def
deleted file mode 100644
index b688551e..00000000
--- a/templates/system/sysctl/all/node.tag/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Value for sysctl option
diff --git a/templates/system/sysctl/all/node.tag/value/node.def b/templates/system/sysctl/all/node.tag/value/node.def
index ac4daa52..2ec6c0cf 100644
--- a/templates/system/sysctl/all/node.tag/value/node.def
+++ b/templates/system/sysctl/all/node.tag/value/node.def
@@ -1,6 +1,6 @@
+type: txt
priority: 319 # Failure barrier only - no ordering constraints
-type: txt
help: Configure sysctl option
val_help: <integer>; Set sysctl option
diff --git a/templates/system/sysctl/custom/node.def b/templates/system/sysctl/custom/node.def
index f03a3e13..4e6480ea 100644
--- a/templates/system/sysctl/custom/node.def
+++ b/templates/system/sysctl/custom/node.def
@@ -1,5 +1,5 @@
tag:
priority: 318
type: txt
-help: Define specific sysctl options to modify
-val_help: <sysctl_option> ; Name of sysctl option you want to modufy
+help: Define specific sysctl option to modify
+val_help: <sysctl_option> ; Name of sysctl option you want to modify
diff --git a/templates/system/sysctl/custom/node.tag/node.def b/templates/system/sysctl/custom/node.tag/node.def
deleted file mode 100644
index b688551e..00000000
--- a/templates/system/sysctl/custom/node.tag/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Value for sysctl option
diff --git a/templates/system/sysctl/custom/node.tag/value/node.def b/templates/system/sysctl/custom/node.tag/value/node.def
index 08a5f5a3..eefc0cbf 100644
--- a/templates/system/sysctl/custom/node.tag/value/node.def
+++ b/templates/system/sysctl/custom/node.tag/value/node.def
@@ -1,8 +1,7 @@
+type: txt
priority: 319 # Failure barrier only - no ordering constraints
-type: txt
help: Configure sysctl option
-val_help: <value>; Set sysctl option value
+val_help: <value>; Set sysctl option to specified value
update: sudo /opt/vyatta/sbin/vyatta_update_sysctl.pl --option $VAR(../@) $VAR(@)
-
diff --git a/templates/system/sysctl/net.ipv4.igmp_max_memberships/node.def b/templates/system/sysctl/net.ipv4.igmp_max_memberships/node.def
index 22dba70d..a559a478 100644
--- a/templates/system/sysctl/net.ipv4.igmp_max_memberships/node.def
+++ b/templates/system/sysctl/net.ipv4.igmp_max_memberships/node.def
@@ -1,12 +1,8 @@
-#
-# Configuration template for offload settings
-#
-
+type: u32
priority: 319 # Failure barrier only - no ordering constraints
-type: u32
help: Configure net.ipv4.igmp_max_memberships option
-val_help: <integer>; Set net.ipv4.igmp_max_memberships value
+val_help: <integer>; Set net.ipv4.igmp_max_memberships to specified value
update: sudo /opt/vyatta/sbin/vyatta_update_sysctl.pl --option net.ipv4.igmp_max_memberships $VAR(@)
diff --git a/templates/system/sysctl/net.ipv4.ipfrag_time/node.def b/templates/system/sysctl/net.ipv4.ipfrag_time/node.def
index ee390f44..671d6e01 100644
--- a/templates/system/sysctl/net.ipv4.ipfrag_time/node.def
+++ b/templates/system/sysctl/net.ipv4.ipfrag_time/node.def
@@ -1,12 +1,7 @@
-#
-# Configuration template for offload settings
-#
-
+type: u32
priority: 319 # Failure barrier only - no ordering constraints
-type: u32
help: Configure net.ipv4.ipfrag_time option
-val_help: <integer>; Set net.ipv4.ipfrag_time to specific value
+val_help: <integer>; Set net.ipv4.ipfrag_time to specified value
update: sudo /opt/vyatta/sbin/vyatta_update_sysctl.pl --option net.ipv4.ipfrag_time $VAR(@)
-