From 510c9c02d9c654ae57968b28e92a22f36f3dbb66 Mon Sep 17 00:00:00 2001
From: Bob Gilligan <gilligan@vyatta.com>
Date: Tue, 9 Mar 2010 15:10:06 -0800
Subject: Bugfix 5021: Make smp_affinity configuration tolerant of failures.

---
 templates/interfaces/ethernet/node.tag/smp_affinity/node.def | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'templates/interfaces/ethernet')

diff --git a/templates/interfaces/ethernet/node.tag/smp_affinity/node.def b/templates/interfaces/ethernet/node.tag/smp_affinity/node.def
index a444ae92..098287cc 100644
--- a/templates/interfaces/ethernet/node.tag/smp_affinity/node.def
+++ b/templates/interfaces/ethernet/node.tag/smp_affinity/node.def
@@ -9,6 +9,8 @@
 # the system.
 #
 
+priority: 319 # Failure barrier only - no ordering constraints
+
 type: txt
 
 help: Set CPU interrupt affinity mask for this interface
@@ -30,6 +32,7 @@ update:
 	if [ "$VAR(@)" = "auto" ]; then
 	    echo "Setting SMP affinity for $VAR(../@) automatically."
 	    sudo /opt/vyatta/sbin/vyatta-auto-irqaffin.pl --setup $VAR(../@)
+	    exit 0
 	else
 	    sudo /opt/vyatta/sbin/vyatta-irqaffin set $VAR(../@) $VAR(@)
 	    if [ $? -ne 0 ]; then
@@ -40,6 +43,6 @@ update:
 
 delete: [ -d /sys/class/net/$VAR(../@) ] || exit 0
 	if ! sudo /opt/vyatta/sbin/vyatta-irqaffin reset $VAR(../@); then
-	    echo "Error deleting CPU affinity mask on interface $VAR(../@)"
-	    exit 1
+	    echo "Warning: Can't reset CPU affinity mask on interface $VAR(../@)"
+	    exit 0
 	fi
-- 
cgit v1.2.3