oops
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sat, 8 Jan 2011 16:36:20 +0000 (17:36 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sat, 8 Jan 2011 16:36:20 +0000 (17:36 +0100)
scripts/manage-infrastructure.py

index 8b78b3d..11fc8c3 100755 (executable)
@@ -244,10 +244,10 @@ class BuildBoxes:
             modules=self.backquote_ssh(box,command).split('\n')
             kqemu_msg='*NO kqemu/kmv MODULE LOADED*'
             for module in modules:
-                if module.find('kqemu module loaded')==0:
-                    kqemu_msg='kqemu OK'
-                elif module.find('kvm module loaded')==0:
-                    kqemu_msg='kvm OK'
+                if module.find('kqemu')==0:
+                    kqemu_msg='kqemu module loaded'
+                elif module.find('kvm')==0:
+                    kqemu_msg='kvm module loaded'
             
             command=['pgrep','qemu']
             if self.options.dry_run:
@@ -255,7 +255,7 @@ class BuildBoxes:
             else:
                 pids=self.backquote_ssh(box,command)
                 if not pids:
-                    self.header ('No qemu process on %s'%box)
+                    self.header ('No qemu process on %s (%s)'%(box,kqemu_msg))
                 else:
                     self.header ("Active qemu processes on %s (%s)"%(box,kqemu_msg))
                     command=['ps','-o','pid,command'] + [ pid for pid in pids.split("\n") if pid]