The Underscores Revolution: adjust gui-daemon path

dom0/core/qubes.py

@@ -48,7 +48,7 @@ if not dry_run:
     import xen.lowlevel.xs
 
 
-qubes_guid_path = "/usr/bin/qubes_guid"
+qubes_guid_path = "/usr/bin/qubes-guid"
 qrexec_daemon_path = "/usr/lib/qubes/qrexec-daemon"
 qrexec_client_path = "/usr/lib/qubes/qrexec-client"
 
@@ -1505,7 +1505,7 @@ class QubesVm(object):
             guid_cmd += ['-v', '-v']
         retcode = subprocess.call (guid_cmd)
         if (retcode != 0) :
-            raise QubesException("Cannot start qubes_guid!")
+            raise QubesException("Cannot start qubes-guid!")
 
         if verbose:
             print >> sys.stderr, "--> Waiting for qubes-session..."
@@ -2566,7 +2566,7 @@ class QubesHVm(QubesVm):
 
             retcode = subprocess.call ([qubes_guid_path, "-d", str(self.stubdom_xid), "-c", self.label.color, "-i", self.label.icon_path, "-l", str(self.label.index)])
             if (retcode != 0) :
-                raise QubesException("Cannot start qubes_guid!")
+                raise QubesException("Cannot start qubes-guid!")
 
     def start_qrexec_daemon(self, **kwargs):
         if self.qrexec_installed:

dom0/dispvm/qubes_restore.c

@@ -168,13 +168,13 @@ void start_guid(int domid, int argc, char **argv)
 	char dstr[40];
 	char *guid_args[argc + 1];
 	snprintf(dstr, sizeof(dstr), "%d", domid);
-	guid_args[0] = "qubes_guid";
+	guid_args[0] = "qubes-guid";
 	guid_args[1] = "-d";
 	guid_args[2] = dstr;
 	for (i = 0; i < argc; i++)
 		guid_args[i+3] = argv[i];
 	guid_args[argc+3] = NULL;
-	execv("/usr/bin/qubes_guid", guid_args);
+	execv("/usr/bin/qubes-guid", guid_args);
 	perror("execv");
 }
 
@@ -479,8 +479,8 @@ int main(int argc, char **argv)
 	rm_fast_flag();
 	fprintf(stderr, "time=%s, starting qrexec\n", gettime());
 	start_rexec(domid, default_user);
-	fprintf(stderr, "time=%s, starting qubes_guid\n", gettime());
+	fprintf(stderr, "time=%s, starting qubes-guid\n", gettime());
 	start_guid(domid, argc-guid_args_start, argv+guid_args_start);
-	fprintf(stderr, "time=%s, started qubes_guid\n", gettime());
+	fprintf(stderr, "time=%s, started qubes-guid\n", gettime());
 	return 0;
 }

dom0/qvm-tools/qvm-start

@@ -28,8 +28,6 @@ import os
 import sys
 import dbus
 
-qubes_guid_path = "/usr/bin/qubes_guid"
-
 notify_object = None
 
 def tray_notify(str, label, timeout = 3000):

dom0/qvm-tools/qvm-template-commit

@@ -26,8 +26,6 @@ from optparse import OptionParser
 import subprocess
 import sys
 
-qubes_guid_path = "/usr/bin/qubes_guid"
-
 def main():
     usage = "usage: %prog [options] <vm-name>"
     parser = OptionParser (usage)