1.1 --- a/OpenSecurity/bin/vmmanager.py	Wed Jan 29 14:25:20 2014 +0100
     1.2 +++ b/OpenSecurity/bin/vmmanager.py	Wed Jan 29 15:38:12 2014 +0100
     1.3 @@ -425,9 +425,8 @@
     1.4                  if (attached_devices and False) or (connected_device not in attached_devices.values()):
     1.5                      new_sdvm = self.generateSDVMName()
     1.6                      self.createVM(new_sdvm)
     1.7 +                    self.storageAttach(new_sdvm)
     1.8                      self.attachRSD(new_sdvm, connected_device)
     1.9 -
    1.10 -
    1.11                      self.startVM(new_sdvm)
    1.12                      # wait for machine to come up
    1.13                      while new_ip == None:
    1.14 @@ -450,7 +449,7 @@
    1.15              new_ip = self.getHostOnlyIP(vm_name)
    1.16          while new_ip not in self.startNotifications:
    1.17              time.sleep(1)
    1.18 -        return
    1.19 +        return new_ip
    1.20      
    1.21      # wait for machine to shutdown
    1.22      def waitShutdown(self, vm_name):
    1.23 @@ -461,13 +460,13 @@
    1.24      # handles browsing request    
    1.25      def handleBrowsingRequest(self):
    1.26          if VMManager.handleDeviceChangeLock.acquire(True):
    1.27 -            new_ip = None
    1.28              new_sdvm = self.generateSDVMName()
    1.29              self.createVM(new_sdvm)
    1.30 +            self.storageAttach(new_sdvm)
    1.31              self.genCertificateISO(new_sdvm)
    1.32              self.attachCertificateISO(new_sdvm)
    1.33              self.startVM(new_sdvm)
    1.34 -            self.waitStartup(new_sdvm)
    1.35 +            new_ip = self.waitStartup(new_sdvm)
    1.36              if new_ip != None:
    1.37                  self.mapNetworkDrive('g:', '\\\\' + new_ip + '\\Download', None, None)
    1.38              #TODO: cleanup notifications somwhere else (eg. machine shutdown)
    1.39 @@ -542,7 +541,7 @@
    1.40          return string.find(str(result), 'DIR',)
    1.41  
    1.42      def mapNetworkDrive(self, drive, networkPath, user, password):
    1.43 -        self.unmapNetworkDrive('h:')
    1.44 +        self.unmapNetworkDrive(drive)
    1.45          #Check for drive availability
    1.46          if self.isAvailable(drive) > -1:
    1.47              print "Drive letter is already in use: ", drive
    1.48 @@ -604,7 +603,7 @@
    1.49      #man.genCertificateISO('SecurityDVM')
    1.50      #man.attachCertificateISO('SecurityDVM')
    1.51      #man.isStorageAttached('SecurityDVM')
    1.52 -    man.guestExecute('SecurityDVM', 'sudo apt-get -y update')
    1.53 +    #man.guestExecute('SecurityDVM', 'sudo apt-get -y update')
    1.54      #man.guestExecute('SecurityDVM', 'sudo apt-get -y upgrade' )
    1.55      
    1.56      #man.stopVM('SecurityDVM')