merge from 2.0 branch

[monitor.git] / monitor / database / info / interface.py

diff --git a/monitor/database/info/interface.py b/monitor/database/info/interface.py
index 2e5064d..47c7553 100644 (file)
--- a/monitor/database/info/interface.py
+++ b/monitor/database/info/interface.py
@@ -1,4 +1,4 @@
-import bootman                 # debug nodes
+from monitor import bootman            # debug nodes
 
 from monitor import reboot
 from monitor.common import *
@@ -193,6 +193,6 @@ class SiteInterface(HistorySiteRecord):
                act = ActionRecord(loginbase=self.db.loginbase,
                                                        hostname=hostname,
                                                        action='reboot',
-                                                       action_type='first_try_reboot',
+                                                       action_type='try_reboot',
                                                        error_string=err)