From 4546c16e3070b829a0e920f57c1a24ae8948fdc7 Mon Sep 17 00:00:00 2001
From: Alex Harpin <development@landsofshadow.co.uk>
Date: Tue, 3 Nov 2015 23:04:37 +0000
Subject: vyatta-cfg-system: rename smp_affinity to smp-affinity

Rename the smp_affinity config option to smp-affinity in line with the
standard option naming convention.

Bug #18 http://bugzilla.vyos.net/show_bug.cgi?id=18
---
 .../interfaces/ethernet/node.tag/disable/node.def  |  2 +-
 .../ethernet/node.tag/smp-affinity/node.def        | 28 ++++++++++++++++++++++
 .../ethernet/node.tag/smp_affinity/node.def        | 28 ----------------------
 3 files changed, 29 insertions(+), 29 deletions(-)
 create mode 100644 templates/interfaces/ethernet/node.tag/smp-affinity/node.def
 delete mode 100644 templates/interfaces/ethernet/node.tag/smp_affinity/node.def

(limited to 'templates/interfaces/ethernet')

diff --git a/templates/interfaces/ethernet/node.tag/disable/node.def b/templates/interfaces/ethernet/node.tag/disable/node.def
index c3f9a9a0..fff51388 100644
--- a/templates/interfaces/ethernet/node.tag/disable/node.def
+++ b/templates/interfaces/ethernet/node.tag/disable/node.def
@@ -12,5 +12,5 @@ delete: [ -d /sys/class/net/$VAR(../@) ] || exit 0
              echo "Error enabling dev $VAR(../@)"
              exit 1
         fi
-	affinity=$VAR(../smp_affinity/@)
+	affinity=$VAR(../smp-affinity/@)
 	sudo /opt/vyatta/sbin/irq-affinity.pl $VAR(../@) ${affinity:-auto}
diff --git a/templates/interfaces/ethernet/node.tag/smp-affinity/node.def b/templates/interfaces/ethernet/node.tag/smp-affinity/node.def
new file mode 100644
index 00000000..59a8997c
--- /dev/null
+++ b/templates/interfaces/ethernet/node.tag/smp-affinity/node.def
@@ -0,0 +1,28 @@
+#
+#
+# Configuration template for interface.ethernet.name.smp-affinity
+#
+# Configure the CPUs that the associated interface will interrupt.
+# SMP affinity is configured by a hexidecimal bitmask that specifies the
+# CPUs that the system can interrupt.  The SMP affinity bitmask must contain
+# at least one bits, and may only contain as many bits as there are CPUs on
+# the system.
+#
+
+priority: 319 # Failure barrier only - no ordering constraints
+
+type: txt
+
+help: CPU interrupt affinity mask
+
+val_help: auto; Automatic CPU affinity (default)
+val_help: <hex>; Bitmask representing CPUs that this NIC will interrupt
+val_help: <hex>,<hex>; Bitmasks representing CPUs for interrupt and receive processing
+
+default: "auto"
+
+syntax:expression: $VAR(@) == "auto" || pattern $VAR(@) "^[0-9a-f]+(|,[0-9a-f]+)$" ;
+	"IRQ affinity mask must be hex value or auto"
+
+update:	sudo /opt/vyatta/sbin/irq-affinity.pl $VAR(../@) $VAR(@)
+
diff --git a/templates/interfaces/ethernet/node.tag/smp_affinity/node.def b/templates/interfaces/ethernet/node.tag/smp_affinity/node.def
deleted file mode 100644
index 1f8a2610..00000000
--- a/templates/interfaces/ethernet/node.tag/smp_affinity/node.def
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-#
-# Configuration template for interface.ethernet.name.smp_affinity
-#
-# Configure the CPUs that the associated interface will interrupt.
-# SMP affinity is configured by a hexidecimal bitmask that specifies the
-# CPUs that the system can interrupt.  The SMP affinity bitmask must contain
-# at least one bits, and may only contain as many bits as there are CPUs on
-# the system.
-#
-
-priority: 319 # Failure barrier only - no ordering constraints
-
-type: txt
-
-help: CPU interrupt affinity mask
-
-val_help: auto; Automatic CPU affinity (default)
-val_help: <hex>; Bitmask representing CPUs that this NIC will interrupt
-val_help: <hex>,<hex>; Bitmasks representing CPUs for interrupt and receive processing
-
-default: "auto"
-
-syntax:expression: $VAR(@) == "auto" || pattern $VAR(@) "^[0-9a-f]+(|,[0-9a-f]+)$" ;
-	"IRQ affinity mask must be hex value or auto"
-
-update:	sudo /opt/vyatta/sbin/irq-affinity.pl $VAR(../@) $VAR(@)
-
-- 
cgit v1.2.3