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

The Underscores Revolution: adjust qrexec path

Browse Source
This commit is contained in:
Marek Marczykowski 2013-03-14 04:06:55 +01:00
parent c90f5199dd
commit 4dbe0e0210
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom0/dispvm/qfile-daemon-dvm
View File

@ -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)

2
dom0/dispvm/qubes_restore.c
View File

@ -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);

6
dom0/qvm-core/qubes.py
View File

@ -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:

4
dom0/qvm-tools/qubes-dom0-update
View File

@ -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