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

The Underscores Revolution: adjust gui-daemon path

Browse Source
This commit is contained in:
Marek Marczykowski 2013-03-14 04:46:27 +01:00
parent 50a8068e6f
commit 1d39ab206a
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom0/core/qubes.py
View File

@ -48,7 +48,7 @@ if not dry_run:
import xen.lowlevel.xs 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_daemon_path = "/usr/lib/qubes/qrexec-daemon"
qrexec_client_path = "/usr/lib/qubes/qrexec-client" qrexec_client_path = "/usr/lib/qubes/qrexec-client"
@ -1505,7 +1505,7 @@ class QubesVm(object):
guid_cmd += ['-v', '-v'] guid_cmd += ['-v', '-v']
retcode = subprocess.call (guid_cmd) retcode = subprocess.call (guid_cmd)
if (retcode != 0) : if (retcode != 0) :
raise QubesException("Cannot start qubes_guid!") raise QubesException("Cannot start qubes-guid!")
if verbose: if verbose:
print >> sys.stderr, "--> Waiting for qubes-session..." 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)]) 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) : if (retcode != 0) :
raise QubesException("Cannot start qubes_guid!") raise QubesException("Cannot start qubes-guid!")
def start_qrexec_daemon(self, **kwargs): def start_qrexec_daemon(self, **kwargs):
if self.qrexec_installed: if self.qrexec_installed:

8
dom0/dispvm/qubes_restore.c
View File

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

2
dom0/qvm-tools/qvm-start
View File

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

2
dom0/qvm-tools/qvm-template-commit
View File

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