dgquintas / BoincVM / changeset / d5d19e525c85

Up to file-list BoincVMController/controllers/VirtualBoxController.py:

@@ -456,7 +456,7 @@ class VirtualBoxController(object):
       g = ( nums[i:i+2] for i in xrange(0, len(nums), 2) )
       return ':'.join(g)
     ms = cls._vbox.getMachines()
-    entriesGen = ( ( numsToColonNotation(m.getNetworkAdapter(0).MACAddress), str(m.name) )
+    entriesGen = ( ( numsToColonNotation(m.getNetworkAdapter(1).MACAddress), str(m.name) )
         for m in cls._vbox.getMachines() )
     mapping = dict(entriesGen)
     return mapping
@@ -537,15 +537,15 @@ def startVBWebservice(config, controller
   webSrvBin = webSrvBinCmd + " -t 0"
   #check it isn't already running
 #  pid = support.pidof(webSrvBinCmd)
 #  if pid:
 #    logger.warn('VBox webservice server already running! (with pid %d)' % pid)
 #    logger.info('Trying to kill runaway vboxwebsrv (with pid %d)' % pid)
 #    os.kill(pid, 9)
 #    #check it really is gone for good
 #    pidBis = support.pidof(webSrvBinCmd)
 #    if pidBis:
-#      raise SystemError("Can't kill vboxwebsrv proc (pid %d)" % pid)
+  pid = support.pidof(webSrvBinCmd)
   if pid:
     logger.warn('VBox webservice server already running! (with pid %d)' % pid)
     logger.info('Trying to kill runaway vboxwebsrv (with pid %d)' % pid)
     os.kill(pid, 9)
     #check it really is gone for good
     pidBis = support.pidof(webSrvBinCmd)
     if pidBis:
       raise SystemError("Can't kill vboxwebsrv proc (pid %d)" % pid)
   hvHelperCmd = os.path.join(config.get('Host', 'hypervisor_helpers_path'), webSrvBin )
   cmdWithArgs = os.path.basename(hvHelperCmd)

commit 139:	d5d19e525c85
parent 138:	0cf1d242ee7f
branch:	default