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

core: rename QubesDom0NetVm to QubesAdminVm

Browse Source 
This is somehow related to #757, but only first (easier) step. Actual
change of QubesAdminVm base class requires somehow more changes, for
example qvm-ls needs to know how to display this type of VM (none of
template, appvm, netvm).

Make this first step change now, because starting with R2Beta3 dom0 will
be stored in qubes.xml (for new backups purposes) so this rename would
be complicated later.
This commit is contained in:
Marek Marczykowski-Górecki 2013-11-29 03:42:56 +01:00
parent 3d70402778
commit b73970c62d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core-modules/006QubesDom0NetVm.py → core-modules/006QubesAdminVm.py
View File

@ -25,13 +25,13 @@ from qubes.qubes import QubesNetVm,register_qubes_vm_class,xl_ctx,xc
from qubes.qubes import defaults
from qubes.qubes import QubesException,dry_run
class QubesDom0NetVm(QubesNetVm):
class QubesAdminVm(QubesNetVm):
# In which order load this VM type from qubes.xml
load_order = 10
def __init__(self, **kwargs):
super(QubesDom0NetVm, self).__init__(qid=0, name="dom0", netid=0,
super(QubesAdminVm, self).__init__(qid=0, name="dom0", netid=0,
dir_path=None,
private_img = None,
template = None,
@ -41,7 +41,7 @@ class QubesDom0NetVm(QubesNetVm):
@property
def type(self):
return "Dom0NetVM"
return "AdminVM"
def is_running(self):
return True
@ -94,4 +94,4 @@ class QubesDom0NetVm(QubesNetVm):
def verify_files(self):
return True
register_qubes_vm_class(QubesDom0NetVm)
register_qubes_vm_class(QubesAdminVm)

2
core/qubes.py
View File

@ -660,7 +660,7 @@ class QubesVmCollection(dict):
# Add dom0 if wasn't present in qubes.xml
if not 0 in self.keys():
dom0vm = QubesDom0NetVm (collection=self)
dom0vm = QubesAdminVm (collection=self)
self[dom0vm.qid] = dom0vm
return True