1.1 --- a/OpenSecurity/bin/cygwin.py	Thu May 22 11:38:21 2014 +0200
     1.2 +++ b/OpenSecurity/bin/cygwin.py	Thu May 22 12:17:57 2014 +0200
     1.3 @@ -159,14 +159,14 @@
     1.4              # special: invoking bash as login shell here with
     1.5              # an unquoted command does not execute /etc/profile
     1.6              args = '"' + program + '" ' + arguments
     1.7 +            logger.debug('Launching: ' + program + ' ' + ''.join(arguments))
     1.8              process = Popen(args, startupinfo = _startupinfo, stdin = stdin, stdout = stdout, stderr = stderr, shell = False)
     1.9 -            logger.debug('Launched: ' + program + ' ' + ''.join(arguments))
    1.10              if not wait_return:
    1.11                  return [0, 'working in background', '']
    1.12  				
    1.13              res_stdout, res_stderr = process.communicate()
    1.14              result = process.returncode
    1.15 -			
    1.16 +            logger.debug('Finished: ' + program + ' ' + ''.join(arguments))
    1.17  			#result = process.wait()
    1.18              #res_stdout = process.stdout.read();
    1.19              #res_stderr = process.stderr.read();

     2.1 --- a/OpenSecurity/bin/vmmanager.pyw	Thu May 22 11:38:21 2014 +0200
     2.2 +++ b/OpenSecurity/bin/vmmanager.pyw	Thu May 22 12:17:57 2014 +0200
     2.3 @@ -598,18 +598,19 @@
     2.4           self.vmm = vmmanager
     2.5          
     2.6      def run(self):
     2.7 -        browser = '\\\"/usr/bin/chromium; pidof dbus-launch | xargs kill\\\"'
     2.8 -        if not Cygwin.is_X11_running():
     2.9 -            self.vmm.browsingManager.restart.set()
    2.10 -            return
    2.11 +        #browser = '\\\"/usr/bin/chromium; pidof dbus-launch | xargs kill\\\"'
    2.12 +        browser = '\\\"/usr/bin/chromium\\\"'
    2.13 +        #if not Cygwin.is_X11_running():
    2.14 +        #    self.vmm.browsingManager.restart.set()
    2.15 +        #    return
    2.16          
    2.17          try:
    2.18              self.vmm.browsingManager.started.wait() 
    2.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'))
    2.20 -            #backup settings on vm
    2.21 +            self.vmm.backupFile('/home/osecuser/.config/chromium', self.vmm.browsingManager.appDataDir + '/OpenSecurity/')
    2.22          except:
    2.23 -            logger.error("BrowsingHandler closing. Cleaning up")    
    2.24 -        self.vmm.backupFile('/home/osecuser/.config/chromium', self.vmm.browsingManager.appDataDir + '/OpenSecurity/')
    2.25 +            logger.info("BrowsingHandler closing. Restarting browsing SDVM.")
    2.26 +
    2.27          self.vmm.browsingManager.restart.set()
    2.28          
    2.29