summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaptor Engineering Development Team <support@raptorengineering.com>2018-01-25 03:51:45 -0600
committerRaptor Engineering Development Team <support@raptorengineering.com>2018-04-28 20:52:15 -0500
commitdd0c9c33050ce10a34331de369da800cf8592ea2 (patch)
treea5c0d910999404bb11215867ea2a7118d8030df0
parent4a25768086406abef11b184098c6359aafffd0ea (diff)
downloadphosphor-fan-presence-dd0c9c33050ce10a34331de369da800cf8592ea2.tar.gz
phosphor-fan-presence-dd0c9c33050ce10a34331de369da800cf8592ea2.zip
Lock out zones based on all conditions not matched instead of any condition not matched
This restores CPU1 fan control on Talos systems when CPU1 is installed.
-rwxr-xr-xcontrol/gen-fan-zone-defs.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/control/gen-fan-zone-defs.py b/control/gen-fan-zone-defs.py
index f39a414..fb8fd64 100755
--- a/control/gen-fan-zone-defs.py
+++ b/control/gen-fan-zone-defs.py
@@ -664,9 +664,9 @@ def getEventsInZone(zone_num, zone_conditions, events_data):
for p in e['precondition']['events']:
# Verify precondition applies to current zone
if 'zone_conditions' in p:
+ zone_allowed = False
for zc in p['zone_conditions']:
if 'zones' in zc:
- zone_allowed = False
for z in zc['zones']:
if z == zone_num:
zone_allowed = True
OpenPOWER on IntegriCloud