diff --git a/appvm/qubes_core b/appvm/qubes_core index 714727a2..6b100294 100755 --- a/appvm/qubes_core +++ b/appvm/qubes_core @@ -85,6 +85,8 @@ start() MEMINFO_DELAY_USEC=100000 /usr/lib/qubes/meminfo-writer $MEM_CHANGE_THRESHOLD_KB $MEMINFO_DELAY_USEC & + /usr/lib/qubes/qrexec_agent 2>/var/log/qubes/qrexec_agent.log & + [ -x /rw/config/rc.local ] && /rw/config/rc.local success echo "" diff --git a/dom0/qvm-tools/qvm-run b/dom0/qvm-tools/qvm-run index 6125ad5d..e6f22343 100755 --- a/dom0/qvm-tools/qvm-run +++ b/dom0/qvm-tools/qvm-run @@ -33,6 +33,7 @@ import time qubes_guid_path = "/usr/bin/qubes_guid" qubes_clipd_path = "/usr/bin/qclipd" qubes_qfilexchgd_path= "/usr/bin/qfilexchgd" +qrexec_daemon_path = "/usr/lib/qubes/qrexec_daemon" notify_object = None # how long (in sec) to wait for VMs to shutdown @@ -78,6 +79,11 @@ def vm_run_cmd(vm, cmd, options): if options.tray: tray_notify ("Starting the '{0}' VM...".format(vm.name), label=vm.label) xid = vm.start(verbose=options.verbose) + retcode = subprocess.call ([qrexec_daemon_path, str(xid)]) + if (retcode != 0) : + print "ERROR: Cannot start qrexec_daemon!" + exit (1) + except (IOError, OSError, QubesException) as err: print "ERROR: {0}".format(err) if options.tray: diff --git a/dom0/qvm-tools/qvm-start b/dom0/qvm-tools/qvm-start index 197a3c2c..cd99f71e 100755 --- a/dom0/qvm-tools/qvm-start +++ b/dom0/qvm-tools/qvm-start @@ -26,6 +26,7 @@ from optparse import OptionParser import subprocess qubes_guid_path = "/usr/bin/qubes_guid" +qrexec_daemon_path = "/usr/lib/qubes/qrexec_daemon" def main(): usage = "usage: %prog [options] " @@ -60,6 +61,11 @@ def main(): print "ERROR: {0}".format(err) exit (1) + retcode = subprocess.call ([qrexec_daemon_path, str(xid)]) + if (retcode != 0) : + print "ERROR: Cannot start qrexec_daemon!" + exit (1) + if options.noguid: exit (0) if options.verbose: diff --git a/netvm/qubes_core b/netvm/qubes_core index dbfaad7a..d7f8594d 100755 --- a/netvm/qubes_core +++ b/netvm/qubes_core @@ -28,6 +28,9 @@ start() echo "NS2=$secondary_dns" >> /var/run/qubes/qubes_ns /usr/lib/qubes/qubes_setup_dnat_to_ns echo "1" > /proc/sys/net/ipv4/ip_forward + + /usr/lib/qubes/qrexec_agent 2>/var/log/qubes/qrexec_agent.log & + success echo "" return 0