OpenSecurity/bin/vmmanager.pyw
changeset 169 a133c8d03ef8
parent 167 1e1811fa44bc
child 170 81d5f845d966
     1.1 --- a/OpenSecurity/bin/vmmanager.pyw	Thu May 22 11:00:33 2014 +0200
     1.2 +++ b/OpenSecurity/bin/vmmanager.pyw	Thu May 22 12:17:57 2014 +0200
     1.3 @@ -598,18 +598,19 @@
     1.4           self.vmm = vmmanager
     1.5          
     1.6      def run(self):
     1.7 -        browser = '\\\"/usr/bin/chromium; pidof dbus-launch | xargs kill\\\"'
     1.8 -        if not Cygwin.is_X11_running():
     1.9 -            self.vmm.browsingManager.restart.set()
    1.10 -            return
    1.11 +        #browser = '\\\"/usr/bin/chromium; pidof dbus-launch | xargs kill\\\"'
    1.12 +        browser = '\\\"/usr/bin/chromium\\\"'
    1.13 +        #if not Cygwin.is_X11_running():
    1.14 +        #    self.vmm.browsingManager.restart.set()
    1.15 +        #    return
    1.16          
    1.17          try:
    1.18              self.vmm.browsingManager.started.wait() 
    1.19              result = Cygwin.checkResult(Cygwin.sshExecuteX11(browser, self.vmm.browsingManager.ip_addr, 'osecuser', Cygwin.cygPath(self.vmm.getMachineFolder()) + '/' + self.vmm.browsingManager.vm_name + '/dvm_key'))
    1.20 -            #backup settings on vm
    1.21 +            self.vmm.backupFile('/home/osecuser/.config/chromium', self.vmm.browsingManager.appDataDir + '/OpenSecurity/')
    1.22          except:
    1.23 -            logger.error("BrowsingHandler closing. Cleaning up")    
    1.24 -        self.vmm.backupFile('/home/osecuser/.config/chromium', self.vmm.browsingManager.appDataDir + '/OpenSecurity/')
    1.25 +            logger.info("BrowsingHandler closing. Restarting browsing SDVM.")
    1.26 +
    1.27          self.vmm.browsingManager.restart.set()
    1.28          
    1.29