diff options
| author | Bob Gilligan <gilligan@vyatta.com> | 2010-03-09 15:10:06 -0800 |
|---|---|---|
| committer | Robert Bays <rbays@roatan.(none)> | 2010-06-09 13:55:21 -0700 |
| commit | 27293369c1203c1d3438e850d1d766752ca476f5 (patch) | |
| tree | 28e82b29c14c3bd3b7775616fde73444566e4391 | |
| parent | c1c0b931fd7486bece959a86427f23f65a0cf1e8 (diff) | |
| download | vyatta-cfg-system-27293369c1203c1d3438e850d1d766752ca476f5.tar.gz vyatta-cfg-system-27293369c1203c1d3438e850d1d766752ca476f5.zip | |
Bugfix 5021: Make smp_affinity configuration tolerant of failures.
| -rw-r--r-- | templates/interfaces/ethernet/node.tag/smp_affinity/node.def | 7 |
1 files changed, 5 insertions, 2 deletions
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 |