From 27f49c1c5bc0b9656a2931c17d5092a372447c61 Mon Sep 17 00:00:00 2001
From: Alex Harpin <development@landsofshadow.co.uk>
Date: Mon, 30 Nov 2015 22:10:30 +0000
Subject: 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
---
 templates/system/sysctl/all/node.tag/node.def                  | 1 -
 templates/system/sysctl/all/node.tag/value/node.def            | 2 +-
 templates/system/sysctl/custom/node.def                        | 4 ++--
 templates/system/sysctl/custom/node.tag/node.def               | 1 -
 templates/system/sysctl/custom/node.tag/value/node.def         | 5 ++---
 templates/system/sysctl/net.ipv4.igmp_max_memberships/node.def | 8 ++------
 templates/system/sysctl/net.ipv4.ipfrag_time/node.def          | 9 ++-------
 7 files changed, 9 insertions(+), 21 deletions(-)
 delete mode 100644 templates/system/sysctl/all/node.tag/node.def
 delete mode 100644 templates/system/sysctl/custom/node.tag/node.def

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(@)
-
-- 
cgit v1.2.3