turning off 'enfoui' for now

diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py
index 73a7931..8a57455 100755 (executable)
--- a/system/LocalSubstrate.inria.py
+++ b/system/LocalSubstrate.inria.py
@@ -42,7 +42,8 @@ class OnelabSubstrate (Substrate):
 
    def qemu_boxes_spec (self):
       return [ # how many qemus max in this box
 
    def qemu_boxes_spec (self):
       return [ # how many qemus max in this box

-         ('kvm64-6', 4), # 4 cores, 8Gb
+# enfoui runs f18 - also can't seem to enter BIOS on that one
+#         ('kvm64-6', 4), # 4 cores, 8Gb

          ('kvm64-1', 3), # 4 cores, 4Gb
          ('kvm64-2', 3), # 4 cores, 4Gb
          ('kvm64-4', 2), # 4 cores, 8Gb
          ('kvm64-1', 3), # 4 cores, 4Gb
          ('kvm64-2', 3), # 4 cores, 4Gb
          ('kvm64-4', 2), # 4 cores, 8Gb

diff --git a/system/Substrate.py b/system/Substrate.py
index 5196904..84d3acb 100644 (file)
--- a/system/Substrate.py
+++ b/system/Substrate.py
@@ -712,9 +712,11 @@ class QemuBox (Box):
         for module in modules:
             if module.find('kqemu')==0:
                 self._driver='kqemu module loaded'
         for module in modules:
             if module.find('kqemu')==0:
                 self._driver='kqemu module loaded'

-            # kvm might be loaded without vkm_intel (we dont have AMD)
+            # kvm might be loaded without kvm_intel (we dont have AMD)

             elif module.find('kvm_intel')==0:
                 self._driver='kvm_intel module loaded'
             elif module.find('kvm_intel')==0:
                 self._driver='kvm_intel module loaded'

+            elif module=='kvm':
+                self._driver='kvm module loaded'

         ########## find out running pids
         pids=self.backquote_ssh(['pgrep','qemu'])
         if not pids: return
         ########## find out running pids
         pids=self.backquote_ssh(['pgrep','qemu'])
         if not pids: return