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

Allow to create Standalone VM (#669)

Browse Source
This commit is contained in:
Marek Marczykowski 2012-11-09 21:04:29 +01:00
parent 85f240d887
commit e756d31bb5
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
newappvmdlg.ui
View File

@ -85,6 +85,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="3">
<widget class="QCheckBox" name="standalone">
<property name="text">
<string>Standalone</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item> <item>

14
qubesmanager/create_new_vm.py
View File

@ -102,7 +102,12 @@ class NewVmDlg (QDialog, Ui_NewVMDlg):
def on_hvm_radio_toggled(self, checked): def on_hvm_radio_toggled(self, checked):
if checked: if checked:
self.template_name.setEnabled(False) self.template_name.setEnabled(False)
self.standalone.setEnabled(False)
self.standalone.setChecked(True)
self.allow_networking.setEnabled(True) self.allow_networking.setEnabled(True)
else:
self.standalone.setEnabled(True)
self.standalone.setChecked(False)
def reject(self): def reject(self):
@ -120,6 +125,8 @@ class NewVmDlg (QDialog, Ui_NewVMDlg):
if self.template_name.isEnabled(): if self.template_name.isEnabled():
template_vm = self.template_vm_list[self.template_name.currentIndex()] template_vm = self.template_vm_list[self.template_name.currentIndex()]
standalone = self.standalone.isChecked()
allow_networking = None allow_networking = None
if self.allow_networking.isEnabled(): if self.allow_networking.isEnabled():
allow_networking = self.allow_networking.isChecked() allow_networking = self.allow_networking.isChecked()
@ -139,7 +146,7 @@ class NewVmDlg (QDialog, Ui_NewVMDlg):
thread_monitor = ThreadMonitor() thread_monitor = ThreadMonitor()
thread = threading.Thread (target=self.do_create_vm, args=(createvm_method, vmname, label, template_vm, allow_networking, thread_monitor)) thread = threading.Thread (target=self.do_create_vm, args=(createvm_method, vmname, label, template_vm, standalone, allow_networking, thread_monitor))
thread.daemon = True thread.daemon = True
thread.start() thread.start()
@ -163,14 +170,17 @@ class NewVmDlg (QDialog, Ui_NewVMDlg):
def do_create_vm (self, createvm_method, vmname, label, template_vm, allow_networking, thread_monitor): def do_create_vm (self, createvm_method, vmname, label, template_vm, standalone, allow_networking, thread_monitor):
vm = None vm = None
try: try:
self.qvm_collection.lock_db_for_writing() self.qvm_collection.lock_db_for_writing()
self.qvm_collection.load() self.qvm_collection.load()
if template_vm is not None: if template_vm is not None:
if not standalone:
vm = createvm_method(vmname, template_vm, label = label) vm = createvm_method(vmname, template_vm, label = label)
else:
vm = createvm_method(vmname, None, label = label)
vm.create_on_disk(verbose=False, source_template = template_vm) vm.create_on_disk(verbose=False, source_template = template_vm)
else: else:
vm = createvm_method(vmname, label = label) vm = createvm_method(vmname, label = label)