Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/189'

Browse Source 
* origin/pr/189:
  Better settings for a newly created VM
  Changed checking for VM name in use
This commit is contained in:
Marek Marczykowski-Górecki 2019-07-31 17:29:00 +02:00
commit 1dadca8ed8
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qubesmanager/create_new_vm.py
View File

@ -135,12 +135,10 @@ class NewVmDlg(QtGui.QDialog, Ui_NewVMDlg):
else 'StandaloneVM') else 'StandaloneVM')
name = str(self.name.text()) name = str(self.name.text())
try:
self.app.domains[name] if name in self.app.domains:
except LookupError: QtGui.QMessageBox.warning(
pass None,
else:
QtGui.QMessageBox.warning(None,
self.tr('Incorrect qube name!'), self.tr('Incorrect qube name!'),
self.tr('A qube with the name <b>{}</b> already exists in the ' self.tr('A qube with the name <b>{}</b> already exists in the '
'system!').format(name)) 'system!').format(name))
@ -155,9 +153,12 @@ class NewVmDlg(QtGui.QDialog, Ui_NewVMDlg):
properties = {} properties = {}
properties['provides_network'] = self.provides_network.isChecked() properties['provides_network'] = self.provides_network.isChecked()
if self.netvm.currentIndex() != 0: if self.netvm.currentIndex() != 0:
properties['netvm'] = self.netvm_list[self.netvm.currentIndex()] properties['netvm'] = self.netvm_list[self.netvm.currentIndex()]
if self.install_system.isChecked():
# Standalone - not based on a template
if self.vm_type.currentIndex() == 2:
properties['virt_mode'] = 'hvm' properties['virt_mode'] = 'hvm'
properties['kernel'] = None properties['kernel'] = None