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

dom0/qvm-prefs: info when kernel setting is from template

Browse Source
This commit is contained in:
Marek Marczykowski 2011-08-31 18:32:37 +02:00
parent dd7edbdfea
commit fbce32ae1f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom0/qvm-core/qubes.py
View File

@ -290,6 +290,7 @@ class QubesVm(object):
if template_vm is not None:
self.kernels_dir = template_vm.kernels_dir
self.kernel = template_vm.kernel
elif self.kernel is not None:
self.kernels_dir = qubes_kernels_base_dir + "/" + self.kernel
else:

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

@ -54,7 +54,9 @@ def do_list(vm):
print fmt.format ("private img", vm.private_img)
print fmt.format ("memory", vm.memory)
print fmt.format ("maxmem", vm.maxmem)
if vm.uses_default_kernel:
if vm.template_vm is not None:
print fmt.format ("kernel", "%s (from template)" % vm.kernel)
elif vm.uses_default_kernel:
print fmt.format ("kernel", "%s (default)" % vm.kernel)
else:
print fmt.format ("kernel", vm.kernel)