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

dispvm: start guid during savefile preparation

Browse Source 
Now gui-agent supports reconnect to guid, so start it early to have Xorg
running in the VM.

This is still not done - for example it tries to run some commands via
(not running yet) qrexec.
This commit is contained in:
Marek Marczykowski-Górecki 2014-01-24 06:42:20 +01:00
parent 60d373dbda
commit 68ad6d0760
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core-modules/000QubesVm.py
View File

@ -1577,13 +1577,13 @@ class QubesVm(object):
# the successful unpause is some indicator of it # the successful unpause is some indicator of it
qmemman_client.close() qmemman_client.close()
if self._start_guid_first and start_guid and not preparing_dvm and os.path.exists('/var/run/shm.id'): if self._start_guid_first and start_guid and os.path.exists('/var/run/shm.id'):
self.start_guid(verbose=verbose, notify_function=notify_function, before_qrexec=True) self.start_guid(verbose=verbose, notify_function=notify_function, before_qrexec=True)
if not preparing_dvm: if not preparing_dvm:
self.start_qrexec_daemon(verbose=verbose,notify_function=notify_function) self.start_qrexec_daemon(verbose=verbose,notify_function=notify_function)
if start_guid and not preparing_dvm and os.path.exists('/var/run/shm.id'): if start_guid and os.path.exists('/var/run/shm.id'):
self.start_guid(verbose=verbose, notify_function=notify_function) self.start_guid(verbose=verbose, notify_function=notify_function)
if preparing_dvm: if preparing_dvm:

3
dispvm/qubes-prepare-saved-domain.sh
View File

@ -25,7 +25,7 @@ if ! [ -d $VMDIR ] ; then
echo $VMDIR does not exist ? echo $VMDIR does not exist ?
exit 1 exit 1
fi fi
if ! qvm-start $1 --no-guid --dvm ; then if ! qvm-start $1 --dvm ; then
exit 1 exit 1
fi fi
@ -41,6 +41,7 @@ fi
#set -x #set -x
xenstore-write /local/domain/$ID/qubes-save-request 1 xenstore-write /local/domain/$ID/qubes-save-request 1
xenstore-watch-qubes /local/domain/$ID/device/qubes-used-mem xenstore-watch-qubes /local/domain/$ID/device/qubes-used-mem
kill `cat /var/run/qubes/guid-running.$ID`
xenstore-read /local/domain/$ID/qubes-gateway | \ xenstore-read /local/domain/$ID/qubes-gateway | \
cut -d . -f 3 | tr -d "\n" > $VMDIR/netvm-id.txt cut -d . -f 3 | tr -d "\n" > $VMDIR/netvm-id.txt
xl block-detach $1 xvdb xl block-detach $1 xvdb