From 4dbe0e021096b1f3d7166b88b02fe002283b9bf3 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Thu, 14 Mar 2013 04:06:55 +0100
Subject: [PATCH] The Underscores Revolution: adjust qrexec path

---
 dom0/dispvm/qfile-daemon-dvm     | 4 ++--
 dom0/dispvm/qubes_restore.c      | 2 +-
 dom0/qvm-core/qubes.py           | 6 +++---
 dom0/qvm-tools/qubes-dom0-update | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dom0/dispvm/qfile-daemon-dvm b/dom0/dispvm/qfile-daemon-dvm
index c0e46341..0a5d5d9f 100755
--- a/dom0/dispvm/qfile-daemon-dvm
+++ b/dom0/dispvm/qfile-daemon-dvm
@@ -173,8 +173,8 @@ def main():
     lockf.close()
     if dispname is not None:
         print >>sys.stderr, "time=%s, starting VM process" % (str(time.time()))
-        subprocess.call(['/usr/lib/qubes/qrexec_client', '-d', dispname,
-            user+':exec /usr/lib/qubes/qubes_rpc_multiplexer ' + exec_index + " " + src_vmname])
+        subprocess.call(['/usr/lib/qubes/qrexec-client', '-d', dispname,
+            user+':exec /usr/lib/qubes/qubes-rpc-multiplexer ' + exec_index + " " + src_vmname])
         subprocess.call(['/usr/sbin/xl', 'destroy', dispname])
         qfile.remove_disposable_from_qdb(dispname)
 
diff --git a/dom0/dispvm/qubes_restore.c b/dom0/dispvm/qubes_restore.c
index d34a45c2..c7acf439 100644
--- a/dom0/dispvm/qubes_restore.c
+++ b/dom0/dispvm/qubes_restore.c
@@ -149,7 +149,7 @@ void start_rexec(int domid, char *default_user)
 		perror("fork");
 		exit(1);
 	case 0:
-		execl("/usr/lib/qubes/qrexec_daemon", "qrexec_daemon",
+		execl("/usr/lib/qubes/qrexec-daemon", "qrexec-daemon",
 		      dstr, default_user, NULL);
 		perror("execl");
 		exit(1);
diff --git a/dom0/qvm-core/qubes.py b/dom0/qvm-core/qubes.py
index a620bcec..c9003681 100755
--- a/dom0/qvm-core/qubes.py
+++ b/dom0/qvm-core/qubes.py
@@ -49,8 +49,8 @@ if not dry_run:
 
 
 qubes_guid_path = "/usr/bin/qubes_guid"
-qrexec_daemon_path = "/usr/lib/qubes/qrexec_daemon"
-qrexec_client_path = "/usr/lib/qubes/qrexec_client"
+qrexec_daemon_path = "/usr/lib/qubes/qrexec-daemon"
+qrexec_client_path = "/usr/lib/qubes/qrexec-client"
 
 qubes_base_dir   = "/var/lib/qubes"
 
@@ -1521,7 +1521,7 @@ class QubesVm(object):
         retcode = subprocess.call ([qrexec_daemon_path, str(xid), self.default_user], env=qrexec_env)
         if (retcode != 0) :
             self.force_shutdown(xid=xid)
-            raise OSError ("ERROR: Cannot execute qrexec_daemon!")
+            raise OSError ("ERROR: Cannot execute qrexec-daemon!")
 
     def start(self, debug_console = False, verbose = False, preparing_dvm = False, start_guid = True, notify_function = None):
         if dry_run:
diff --git a/dom0/qvm-tools/qubes-dom0-update b/dom0/qvm-tools/qubes-dom0-update
index ff1d39e0..2cf2285c 100755
--- a/dom0/qvm-tools/qubes-dom0-update
+++ b/dom0/qvm-tools/qubes-dom0-update
@@ -80,9 +80,9 @@ echo "Checking for dom0 updates" >&2
 # Start VM if not running already
 qvm-run $QVMRUN_OPTS -a $UPDATEVM true || exit 1
 
-/usr/lib/qubes/qrexec_client -d "$UPDATEVM" -l 'tar c /var/lib/rpm /etc/yum.repos.d /etc/yum.conf 2>/dev/null' 'user:tar x -C /var/lib/qubes/dom0-updates' 2> /dev/null
+/usr/lib/qubes/qrexec-client -d "$UPDATEVM" -l 'tar c /var/lib/rpm /etc/yum.repos.d /etc/yum.conf 2>/dev/null' 'user:tar x -C /var/lib/qubes/dom0-updates' 2> /dev/null
 
-qvm-run $QVMRUN_OPTS --pass-io $UPDATEVM "/usr/lib/qubes/qubes_download_dom0_updates.sh --doit --nogui $ALL_OPTS"
+qvm-run $QVMRUN_OPTS --pass-io $UPDATEVM "/usr/lib/qubes/qubes-download-dom0-updates.sh --doit --nogui $ALL_OPTS"
 RETCODE=$?
 if [ "$CHECK_ONLY" == "1" ]; then
     exit $RETCODE