Merge pull request #120 from geissonator/debug-mode-watchdog
Disable watchdog timer if debug_mode is set
diff --git a/configs/Barreleye.py b/configs/Barreleye.py
index 7b74179..6403ed6 100644
--- a/configs/Barreleye.py
+++ b/configs/Barreleye.py
@@ -405,8 +405,6 @@
'PRODUCT_0' : '<inventory_root>/system/bios',
'BOARD_3' : '<inventory_root>/system/misc',
'PRODUCT_51' : '<inventory_root>/system/misc',
- 'PRODUCT_100': '<inventory_root>/system',
- 'CHASSIS_100': '<inventory_root>/system/chassis',
'BOARD_100' : '<inventory_root>/system/chassis/io_board',
'BOARD_101' : '<inventory_root>/system/chassis/sas_expander',
'BOARD_102' : '<inventory_root>/system/chassis/hdd_backplane',
diff --git a/configs/Palmetto.py b/configs/Palmetto.py
index bbe4afc..1eed30d 100644
--- a/configs/Palmetto.py
+++ b/configs/Palmetto.py
@@ -154,6 +154,12 @@
'monitor_process' : True,
'process_name' : 'chassis_control.py',
},
+ 'restore' : {
+ 'system_state' : 'BMC_READY',
+ 'start_process' : True,
+ 'monitor_process' : False,
+ 'process_name' : 'discover_system_state.py',
+ },
'bmc_control' : {
'system_state' : 'BMC_STARTING',
'start_process' : True,
diff --git a/pyhwmon/hwmon.py b/pyhwmon/hwmon.py
index e5dc19a..bb363dc 100644
--- a/pyhwmon/hwmon.py
+++ b/pyhwmon/hwmon.py
@@ -65,6 +65,7 @@
self.writeAttribute(attribute,rtn[1])
except:
print "HWMON: Attibute no longer exists: "+attribute
+ self.sensors.pop(objpath,None)
return False