From e756d31bb5f791eb16fc6678e229296fda1383ce Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Fri, 9 Nov 2012 21:04:29 +0100
Subject: [PATCH] Allow to create Standalone VM (#669)

---
 newappvmdlg.ui                |  7 +++++++
 qubesmanager/create_new_vm.py | 16 +++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/newappvmdlg.ui b/newappvmdlg.ui
index c8a86be..7c16c67 100644
--- a/newappvmdlg.ui
+++ b/newappvmdlg.ui
@@ -85,6 +85,13 @@
        </property>
       </widget>
      </item>
+     <item row="1" column="3">
+      <widget class="QCheckBox" name="standalone">
+       <property name="text">
+        <string>Standalone</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>
diff --git a/qubesmanager/create_new_vm.py b/qubesmanager/create_new_vm.py
index f48522f..0a2ee92 100644
--- a/qubesmanager/create_new_vm.py
+++ b/qubesmanager/create_new_vm.py
@@ -102,7 +102,12 @@ class NewVmDlg (QDialog, Ui_NewVMDlg):
     def on_hvm_radio_toggled(self, checked):
         if checked:
             self.template_name.setEnabled(False)
+            self.standalone.setEnabled(False)
+            self.standalone.setChecked(True)
             self.allow_networking.setEnabled(True)
+        else:
+            self.standalone.setEnabled(True)
+            self.standalone.setChecked(False)
 
 
     def reject(self):
@@ -120,6 +125,8 @@ class NewVmDlg (QDialog, Ui_NewVMDlg):
         if self.template_name.isEnabled():
             template_vm = self.template_vm_list[self.template_name.currentIndex()]
 
+        standalone = self.standalone.isChecked()
+
         allow_networking = None
         if self.allow_networking.isEnabled():
             allow_networking = self.allow_networking.isChecked()
@@ -139,7 +146,7 @@ class NewVmDlg (QDialog, Ui_NewVMDlg):
 
 
         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.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
         try:
             self.qvm_collection.lock_db_for_writing()
             self.qvm_collection.load()
 
             if template_vm is not None:
-                vm = createvm_method(vmname, template_vm, label = label)
+                if not standalone:
+                    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)
             else:
                 vm = createvm_method(vmname, label = label)