# HG changeset patch # User Oliver Maurhart # Date 1396515207 -7200 # Node ID 8addda300ca722c1773d2cf464ccd45309e4f986 # Parent 21ce69d582514c73300237e300926904f54c40f4# Parent 7149f29e9570679c1c89319c4aa5183ec9d6daf2 merge diff -r 21ce69d58251 -r 8addda300ca7 OpenSecurity/bin/vmmanager.pyw --- a/OpenSecurity/bin/vmmanager.pyw Thu Apr 03 10:52:56 2014 +0200 +++ b/OpenSecurity/bin/vmmanager.pyw Thu Apr 03 10:53:27 2014 +0200 @@ -191,8 +191,17 @@ #Cygwin.vboxExecute(cmd) checkResult(Cygwin.vboxExecute('dhcpserver modify --ifname \"VirtualBox Host-Only Ethernet Adapter\" --ip 192.168.56.100 --netmask 255.255.255.0 --lowerip 192.168.56.101 --upperip 192.168.56.200')) + def isSDVMExisting(self, vm_name): + sdvms = self.listSDVM() + return vm_name in sdvms + #create new virtual machine instance based on template vm named SecurityDVM (\SecurityDVM\SecurityDVM.vmdk) def createVM(self, vm_name): + if self.isSDVMExisting(vm_name): + return + #remove eventually existing SDVM folder + machineFolder = Cygwin.cygPath(self.machineFolder) + checkResult(Cygwin.bashExecute('/usr/bin/rm -rf \\\"' + machineFolder + '/' + vm_name + '\\\"')) hostonly_if = self.getHostOnlyIFs() checkResult(Cygwin.vboxExecute('createvm --name ' + vm_name + ' --ostype Debian --register')) checkResult(Cygwin.vboxExecute('modifyvm ' + vm_name + ' --memory 512 --vram 10 --cpus 1 --usb on --usbehci on --nic1 hostonly --hostonlyadapter1 \"' + hostonly_if['Name'] + '\" --nic2 nat')) @@ -538,9 +547,9 @@ self.vmm.attachCertificateISO(new_sdvm) self.vmm.startVM(new_sdvm) new_ip = self.vmm.waitStartup(new_sdvm) - #drive = self.vmm.genNetworkDrive() - #if new_ip != None: - # self.vmm.mapNetworkDrive(drive, '\\\\' + new_ip + '\\Download', None, None) + drive = self.vmm.genNetworkDrive() + if new_ip != None: + self.vmm.mapNetworkDrive(drive, '\\\\' + new_ip + '\\Download', None, None) #browser = '/usr/bin/iceweasel' #browser = '/usr/bin/midori' #browser = '/usr/bin/chromium '