Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core

Browse Source
This commit is contained in:
Joanna Rutkowska 2011-07-02 00:29:32 +02:00
commit 3428d95015
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/qubes_core
View File

@ -15,6 +15,8 @@ start()
exit 1 exit 1
fi fi
modprobe u2mfn
# Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read # Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read
chmod 666 /proc/xen/xenbus chmod 666 /proc/xen/xenbus

4
dom0/qvm-tools/qvm-prefs
View File

@ -175,6 +175,10 @@ def set_nonupdateable(vms, vm, args):
return True return True
def set_kernel(vms, vm, args): def set_kernel(vms, vm, args):
if vm.template_vm is not None:
print "Cannot set kernel for template-based VM. Set it for template instead."
return False
if len (args) != 1: if len (args) != 1:
print "Missing kernel version argument!" print "Missing kernel version argument!"
print "Possible values:" print "Possible values:"