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

hvm: default to template's MAC in MAC auto mode (#755)

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2013-11-21 14:49:42 +01:00
parent aeb83d1a45
commit 1b83e5c687
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core-modules/01QubesHVm.py
View File

@ -289,6 +289,19 @@ class QubesHVm(QubesVm):
return None return None
return "vif{0}.+".format(self.stubdom_xid) return "vif{0}.+".format(self.stubdom_xid)
@property
def mac(self):
if self._mac is not None:
return self._mac
elif self.template is not None:
return self.template.mac
else:
return "00:16:3E:5E:6C:{qid:02X}".format(qid=self.qid)
@mac.setter
def mac(self, value):
self._mac = value
def run(self, command, **kwargs): def run(self, command, **kwargs):
if self.qrexec_installed: if self.qrexec_installed:
if 'gui' in kwargs and kwargs['gui']==False: if 'gui' in kwargs and kwargs['gui']==False: