1.1 --- a/OpenSecurity/bin/vmmanager.pyw Thu Apr 03 10:52:56 2014 +0200
1.2 +++ b/OpenSecurity/bin/vmmanager.pyw Thu Apr 03 10:53:27 2014 +0200
1.3 @@ -191,8 +191,17 @@
1.4 #Cygwin.vboxExecute(cmd)
1.5 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'))
1.6
1.7 + def isSDVMExisting(self, vm_name):
1.8 + sdvms = self.listSDVM()
1.9 + return vm_name in sdvms
1.10 +
1.11 #create new virtual machine instance based on template vm named SecurityDVM (\SecurityDVM\SecurityDVM.vmdk)
1.12 def createVM(self, vm_name):
1.13 + if self.isSDVMExisting(vm_name):
1.14 + return
1.15 + #remove eventually existing SDVM folder
1.16 + machineFolder = Cygwin.cygPath(self.machineFolder)
1.17 + checkResult(Cygwin.bashExecute('/usr/bin/rm -rf \\\"' + machineFolder + '/' + vm_name + '\\\"'))
1.18 hostonly_if = self.getHostOnlyIFs()
1.19 checkResult(Cygwin.vboxExecute('createvm --name ' + vm_name + ' --ostype Debian --register'))
1.20 checkResult(Cygwin.vboxExecute('modifyvm ' + vm_name + ' --memory 512 --vram 10 --cpus 1 --usb on --usbehci on --nic1 hostonly --hostonlyadapter1 \"' + hostonly_if['Name'] + '\" --nic2 nat'))
1.21 @@ -538,9 +547,9 @@
1.22 self.vmm.attachCertificateISO(new_sdvm)
1.23 self.vmm.startVM(new_sdvm)
1.24 new_ip = self.vmm.waitStartup(new_sdvm)
1.25 - #drive = self.vmm.genNetworkDrive()
1.26 - #if new_ip != None:
1.27 - # self.vmm.mapNetworkDrive(drive, '\\\\' + new_ip + '\\Download', None, None)
1.28 + drive = self.vmm.genNetworkDrive()
1.29 + if new_ip != None:
1.30 + self.vmm.mapNetworkDrive(drive, '\\\\' + new_ip + '\\Download', None, None)
1.31 #browser = '/usr/bin/iceweasel'
1.32 #browser = '/usr/bin/midori'
1.33 #browser = '/usr/bin/chromium '