From 7fb123db92ed570222bcac081b326b39aed8b67b Mon Sep 17 00:00:00 2001
From: Rafal Wojtczuk <rafal@invisiblethingslab.com>
Date: Wed, 23 Mar 2011 11:34:01 +0100
Subject: [PATCH] Move execution of qrexec_agent to qubes_core

Previously it was in both qubes_core_appvm and qubes_core_netvm;
somehow counterintuitively, qubes_core_netvm executes on appvm, too. So
move it to a common place.
---
 appvm/qubes_core_appvm | 1 -
 common/qubes_core      | 2 ++
 netvm/qubes_core_netvm | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/appvm/qubes_core_appvm b/appvm/qubes_core_appvm
index 25ff7f4..ed250dd 100755
--- a/appvm/qubes_core_appvm
+++ b/appvm/qubes_core_appvm
@@ -55,7 +55,6 @@ start()
     MEM_CHANGE_THRESHOLD_KB=30000
     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 &
 
 	success
 	echo ""
diff --git a/common/qubes_core b/common/qubes_core
index 26fe514..c20f7d7 100755
--- a/common/qubes_core
+++ b/common/qubes_core
@@ -54,6 +54,8 @@ start()
         fi
 	fi
 
+	/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/netvm/qubes_core_netvm b/netvm/qubes_core_netvm
index 2268c01..c4d81dc 100755
--- a/netvm/qubes_core_netvm
+++ b/netvm/qubes_core_netvm
@@ -32,7 +32,6 @@ start()
 		/usr/lib/qubes/qubes_setup_dnat_to_ns
 		echo "1" > /proc/sys/net/ipv4/ip_forward
 	fi
-	/usr/lib/qubes/qrexec_agent 2>/var/log/qubes/qrexec_agent.log &
 	
 	success
 	echo ""