Merge branch 'master' into hvm

Conflicts:
	dom0/init.d/qubes_core
	dom0/qvm-core/qubes.py
	dom0/qvm-tools/qvm-prefs
	version_dom0
	version_vm

dom0/qvm-core/qubes.py

@@ -2817,6 +2817,7 @@ class QubesVmCollection(dict):
                 "uses_default_netvm", "label", "memory", "vcpus", "pcidevs",
                 "maxmem", "kernel", "uses_default_kernel", "kernelopts", "uses_default_kernelopts",
                 "mac", "services", "include_in_backups", "debug", "default_user", "qrexec_installed", "drive" )
+                "mac", "services", "include_in_backups", "debug", "default_user" )
 
         for attribute in common_attr_list:
             kwargs[attribute] = element.get(attribute)

dom0/qvm-tools/qvm-prefs

@@ -296,6 +296,27 @@ def set_drive(vms, vm, args):
         vm.drive = args[0]
     return True
 
+def set_debug(vms, vm, args):
+    if len (args) != 1:
+        print >> sys.stderr, "Missing value (True/False or on/off)!"
+        return False
+
+    if args[0].lower() == "on":
+        vm.debug = True
+    elif args[0].lower() == "off":
+        vm.debug = False
+    else:
+        vm.debug = bool(eval(args[0].capitalize()))
+    return True
+
+def set_default_user(vms, vm, args):
+    if len (args) != 1:
+        print >> sys.stderr, "Missing user name!"
+        return False
+
+    vm.default_user = args[0]
+    return True
+
 def set_include_in_backups(vms, vm, args):
     if len (args) != 1:
         print >> sys.stderr, "Missing value (True/False)!"

version_vm

@@ -1 +1 @@
-2.0.28
+1.7.30