T3565: migrate "system sysctl" to vyos-1x

12 files changed, 1 insertions, 55 deletions

diff --git a/Makefile.am b/Makefile.am
index 65e5b1cb..96aa658d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,7 +76,7 @@ rsyslogdir = /etc/rsyslog.d
 #rsyslog_DATA = sysconf/vyatta-log.conf
 
 curver_DATA = cfg-version/vrrp@2
-curver_DATA += cfg-version/system@20
+curver_DATA += cfg-version/system@21
 curver_DATA += cfg-version/broadcast-relay@1
 curver_DATA += cfg-version/mdns@1
 curver_DATA += cfg-version/dhcp-server@5
diff --git a/cfg-version/system@20 b/cfg-version/system@21
index e69de29b..e69de29b 100644
--- a/cfg-version/system@20
+++ b/cfg-version/system@21
diff --git a/templates/system/node.def b/templates/system/node.def
deleted file mode 100644
index 5a6953a7..00000000
--- a/templates/system/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: System parameters
diff --git a/templates/system/sysctl/all/node.def b/templates/system/sysctl/all/node.def
deleted file mode 100644
index 47f08dbc..00000000
--- a/templates/system/sysctl/all/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-tag:
-priority: 318
-type: txt
-help: List all sysctl options (BROKEN: Does not list all values)
-allowed: /sbin/sysctl -N -a 2>&-
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
deleted file mode 100644
index ac4daa52..00000000
--- a/templates/system/sysctl/all/node.tag/value/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-priority: 319 # Failure barrier only - no ordering constraints
-
-type: txt
-help: Configure sysctl option
-val_help: <integer>; Set sysctl option
-
-update: sudo /opt/vyatta/sbin/vyatta_update_sysctl.pl --option $VAR(../@) $VAR(@)
-
diff --git a/templates/system/sysctl/custom/node.def b/templates/system/sysctl/custom/node.def
deleted file mode 100644
index a072b2ba..00000000
--- a/templates/system/sysctl/custom/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-tag:
-priority: 318
-type: txt
-help: Define specific sysctl options 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
deleted file mode 100644
index 08a5f5a3..00000000
--- a/templates/system/sysctl/custom/node.tag/value/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-priority: 319 # Failure barrier only - no ordering constraints
-
-type: txt
-help: Configure sysctl option
-val_help: <value>; Set sysctl option 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
deleted file mode 100644
index 22dba70d..00000000
--- a/templates/system/sysctl/net.ipv4.igmp_max_memberships/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Configuration template for offload settings
-#
-
-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
-
-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
deleted file mode 100644
index ee390f44..00000000
--- a/templates/system/sysctl/net.ipv4.ipfrag_time/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Configuration template for offload settings
-#
-
-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
-
-update:	sudo /opt/vyatta/sbin/vyatta_update_sysctl.pl --option net.ipv4.ipfrag_time $VAR(@)
-
diff --git a/templates/system/sysctl/node.def b/templates/system/sysctl/node.def
deleted file mode 100644
index 6f6ecedc..00000000
--- a/templates/system/sysctl/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Sysctl options