1.1 --- a/OpenSecurity/bin/opensecurityd.pyw	Fri Jul 18 13:45:09 2014 +0100
     1.2 +++ b/OpenSecurity/bin/opensecurityd.pyw	Fri Aug 29 10:56:26 2014 +0100
     1.3 @@ -155,12 +155,13 @@
     1.4              tmplateUUID = gvm_mgr.getTemplateUUID()
     1.5              if tmplateUUID != None:
     1.6                  logger.debug('found parent uuid ' + tmplateUUID)
     1.7 -                gvm_mgr.storageDetach(gvm_mgr.vmRootName)
     1.8 +                gvm_mgr.detachStorage(gvm_mgr.vmRootName)
     1.9                  gvm_mgr.removeSnapshots(tmplateUUID)
    1.10                  gvm_mgr.removeImage(tmplateUUID)
    1.11              else:
    1.12                  logger.debug('parent uuid not found')
    1.13              gvm_mgr.removeVM(gvm_mgr.vmRootName)
    1.14 +        gvm_mgr.removeVMFolder(gvm_mgr.vmRootName)
    1.15          
    1.16          trace_file_name = os.path.join(Environment('OpenSecurity').log_path, 'OpenSecurity_initial_import.log')
    1.17          trace_file = open(trace_file_name, 'w+')
    1.18 @@ -168,7 +169,7 @@
    1.19          vm_image = Cygwin.cygPath(gvm_mgr.getMachineFolder()) + '/OsecVM.ova'
    1.20          initial_import_script = Cygwin.cygPath(os.path.abspath(os.path.join(os.path.split(__file__)[0], 'initial_vm.sh')))
    1.21          Cygwin.bashExecute('\\"' + initial_import_script + '\\" \'' + vm_image + '\'', wait_return = False, stdout = trace_file, stderr = trace_file) 
    1.22 -
    1.23 +        gvm_mgr.start()
    1.24          res = '{ "init_log": "' + trace_file_name.replace('\\', '\\\\') + '" }'
    1.25          return res
    1.26