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

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

Browse Source
This commit is contained in:
Joanna Rutkowska 2013-02-27 14:25:34 +00:00
commit 2bcc656671
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2412,6 +2412,8 @@ class QubesHVm(QubesVm):
attrs.remove('kernelopts') attrs.remove('kernelopts')
attrs.remove('uses_default_kernelopts') attrs.remove('uses_default_kernelopts')
attrs += [ 'timezone' ] attrs += [ 'timezone' ]
attrs += [ 'qrexec_installed' ]
attrs += [ 'guiagent_installed' ]
return attrs return attrs
def create_on_disk(self, verbose, source_template = None): def create_on_disk(self, verbose, source_template = None):
@ -2582,8 +2584,7 @@ class QubesHVm(QubesVm):
if kwargs.get('verbose'): if kwargs.get('verbose'):
print >> sys.stderr, "--> Waiting for user '%s' login..." % self.default_user print >> sys.stderr, "--> Waiting for user '%s' login..." % self.default_user
# TODO retrieve the notify_function from kwargs ? self.wait_for_session(notify_function=kwargs.get('notify_function', None))
self.wait_for_session(**kwargs)
def pause(self): def pause(self):
if dry_run: if dry_run: