vyatta-cfg-system: rename ethernet offload option nodes

Updates to the changes committed in connection with Bug #365 to allow
a workaround for Xen based network issues.

https://github.com/vyos/vyatta-cfg-system/commit/7a5a8500091589f0ede3d5a1dbc8b6b4b3fabf1d

Rename the offload configuration node to offload-options, shorten the
child node names, rename offload-settings to offload-option and add a
more descriptive error message if an option fails to apply to the
interface.

Bug #612 http://bugzilla.vyos.net/show_bug.cgi?id=612

10 files changed, 64 insertions, 64 deletions

diff --git a/templates/interfaces/ethernet/node.tag/offload-options/generic-receive/node.def b/templates/interfaces/ethernet/node.tag/offload-options/generic-receive/node.def
new file mode 100644
index 00000000..a2bc1ebc
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/offload-options/generic-receive/node.def
@@ -0,0 +1,16 @@
+#
+# Configuration template for offload options
+#
+
+priority: 319 # Failure barrier only - no ordering constraints
+
+type: txt
+help: Configure generic-receive option
+val_help: on; Enable generic-receive
+val_help: off; Disable generic-receive
+
+syntax:expression: $VAR(@) == "on" || $VAR(@) == "off" ; "Must be either 'on' or 'off'"
+
+update: sudo /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../../@) --offload-option generic-receive $VAR(@)
+
+
diff --git a/templates/interfaces/ethernet/node.tag/offload-options/generic-segmentation/node.def b/templates/interfaces/ethernet/node.tag/offload-options/generic-segmentation/node.def
new file mode 100644
index 00000000..bdc25c63
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/offload-options/generic-segmentation/node.def
@@ -0,0 +1,16 @@
+#
+# Configuration template for offload options
+#
+
+priority: 319 # Failure barrier only - no ordering constraints
+
+type: txt
+help: Configure generic-segmentation option
+val_help: on; Enable generic-segmentation
+val_help: off; Disable generic-segmentation
+
+syntax:expression: $VAR(@) == "on" || $VAR(@) == "off" ; "Must be either 'on' or 'off'"
+
+update: sudo /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../../@) --offload-option generic-segmentation $VAR(@)
+
+
diff --git a/templates/interfaces/ethernet/node.tag/offload-options/node.def b/templates/interfaces/ethernet/node.tag/offload-options/node.def
new file mode 100644
index 00000000..59d45778
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/offload-options/node.def
@@ -0,0 +1 @@
+help: Configurable offload options
diff --git a/templates/interfaces/ethernet/node.tag/offload-options/tcp-segmentation/node.def b/templates/interfaces/ethernet/node.tag/offload-options/tcp-segmentation/node.def
new file mode 100644
index 00000000..c8da289e
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/offload-options/tcp-segmentation/node.def
@@ -0,0 +1,15 @@
+#
+# Configuration template for offload options
+#
+
+priority: 319 # Failure barrier only - no ordering constraints
+
+type: txt
+help: Configure tcp-segmentation option
+val_help: on; Enable tcp-segmentation
+val_help: off; Disable tcp-segmentation
+
+syntax:expression: $VAR(@) == "on" || $VAR(@) == "off" ; "Must be either 'on' or 'off'"
+
+update:	sudo /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../../@) --offload-option tcp-segmentation $VAR(@)
+
diff --git a/templates/interfaces/ethernet/node.tag/offload-options/udp-fragmentation/node.def b/templates/interfaces/ethernet/node.tag/offload-options/udp-fragmentation/node.def
new file mode 100644
index 00000000..dcff5b2c
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/offload-options/udp-fragmentation/node.def
@@ -0,0 +1,16 @@
+#
+# Configuration template for offload options
+#
+
+priority: 319 # Failure barrier only - no ordering constraints
+
+type: txt
+help: Configure udp-fragmentation option
+val_help: on; Enable udp-fragmentation
+val_help: off; Disable udp-fragmentation
+
+syntax:expression: $VAR(@) == "on" || $VAR(@) == "off" ; "Must be either 'on' or 'off'"
+
+update: sudo /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../../@) --offload-option udp-fragmentation $VAR(@)
+
+
diff --git a/templates/interfaces/ethernet/node.tag/offload/generic-receive-offload/node.def b/templates/interfaces/ethernet/node.tag/offload/generic-receive-offload/node.def
deleted file mode 100644
index 3491e074..00000000
--- a/templates/interfaces/ethernet/node.tag/offload/generic-receive-offload/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Configuration template for offload settings
-#
-
-priority: 319 # Failure barrier only - no ordering constraints
-
-type: txt
-help: Configure generic-receive-offload option
-val_help: on; Enable generic-receive-offload
-val_help: off; Disable generic-receive-offload
-
-syntax:expression: $VAR(@) == "on" || $VAR(@) == "off" ; "Must be either 'on' or 'off'"
-
-update: sudo /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../../@) --offload-settings generic-receive-offload $VAR(@)
-
-
diff --git a/templates/interfaces/ethernet/node.tag/offload/generic-segmentation-offload/node.def b/templates/interfaces/ethernet/node.tag/offload/generic-segmentation-offload/node.def
deleted file mode 100644
index 1ed7133b..00000000
--- a/templates/interfaces/ethernet/node.tag/offload/generic-segmentation-offload/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Configuration template for offload settings
-#
-
-priority: 319 # Failure barrier only - no ordering constraints
-
-type: txt
-help: Configure generic-segmentation-offload option
-val_help: on; Enable generic-segmentation-offload
-val_help: off; Disable generic-segmentation-offload
-
-syntax:expression: $VAR(@) == "on" || $VAR(@) == "off" ; "Must be either 'on' or 'off'"
-
-update: sudo /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../../@) --offload-settings generic-segmentation-offload $VAR(@)
-
-
diff --git a/templates/interfaces/ethernet/node.tag/offload/node.def b/templates/interfaces/ethernet/node.tag/offload/node.def
deleted file mode 100644
index 180a9e7c..00000000
--- a/templates/interfaces/ethernet/node.tag/offload/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Configuraable offload settings
diff --git a/templates/interfaces/ethernet/node.tag/offload/tcp-segmentation-offload/node.def b/templates/interfaces/ethernet/node.tag/offload/tcp-segmentation-offload/node.def
deleted file mode 100644
index 95a37369..00000000
--- a/templates/interfaces/ethernet/node.tag/offload/tcp-segmentation-offload/node.def
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Configuration template for offload settings
-#
-
-priority: 319 # Failure barrier only - no ordering constraints
-
-type: txt
-help: Configure tcp-segmentation-offload option
-val_help: on; Enable tcp-segmentation-offload
-val_help: off; Disable tcp-segmentation-offload
-
-syntax:expression: $VAR(@) == "on" || $VAR(@) == "off" ; "Must be either 'on' or 'off'"
-
-update:	sudo /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../../@) --offload-settings tcp-segmentation-offload $VAR(@)
-
diff --git a/templates/interfaces/ethernet/node.tag/offload/udp-fragmentation-offload/node.def b/templates/interfaces/ethernet/node.tag/offload/udp-fragmentation-offload/node.def
deleted file mode 100644
index 796c791d..00000000
--- a/templates/interfaces/ethernet/node.tag/offload/udp-fragmentation-offload/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Configuration template for offload settings
-#
-
-priority: 319 # Failure barrier only - no ordering constraints
-
-type: txt
-help: Configure udp-fragmentation-offload option
-val_help: on; Enable udp-fragmentation-offload
-val_help: off; Disable udp-fragmentation-offload
-
-syntax:expression: $VAR(@) == "on" || $VAR(@) == "off" ; "Must be either 'on' or 'off'"
-
-update: sudo /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../../@) --offload-settings udp-fragmentation-offload $VAR(@)
-
-