Commit 26e2eab5 authored by Christian Hesse's avatar Christian Hesse 😲 Committed by Frediano Ziglio

Update all paths /var/run -> /run

Commit 098268a3 (systemd: Update path
in unit file) was a really incomplete change. Let's change every
occurrence of /var/run to /run.
Signed-off-by: Christian Hesse's avatarChristian Hesse <mail@eworm.de>
Acked-by: Frediano Ziglio's avatarFrediano Ziglio <fziglio@redhat.com>
parent 61bf8c45
Pipeline #15356 failed with stage
in 7 minutes and 46 seconds
......@@ -31,7 +31,7 @@ Features:
Then connect to the vm with the multiple monitor client which you want to
use it with using: "spicec --full-screen=auto-config" (or the user portal
equivalent). At this point the agent will write out a:
/var/run/spice-vdagentd/xorg.conf.spice file. With all the necessary magic
/run/spice-vdagentd/xorg.conf.spice file. With all the necessary magic
to get Xinerama working. Move this file to /etc/X11/xorg.conf, then kill
Xorg so that it will get restarted and you should be good to go.
* Limited support for setups with multiple Screens (multiple qxl devices each
......
......@@ -27,7 +27,7 @@
exec="/usr/sbin/spice-vdagentd"
prog="spice-vdagentd"
port="/dev/virtio-ports/com.redhat.spice.0"
pid="/var/run/spice-vdagentd/spice-vdagentd.pid"
pid="/run/spice-vdagentd/spice-vdagentd.pid"
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
......@@ -38,7 +38,7 @@ start() {
[ -c $port ] || exit 0
modprobe uinput > /dev/null 2>&1
# In case the previous running vdagentd crashed
rm -f /var/run/spice-vdagentd/spice-vdagent-sock
rm -f /run/spice-vdagentd/spice-vdagent-sock
echo -n $"Starting $prog: "
daemon --pidfile $pid $exec $SPICE_VDAGENTD_EXTRA_ARGS
retval=$?
......
......@@ -2,4 +2,4 @@
Description=Activation socket for spice guest agent daemon
[Socket]
ListenStream=/var/run/spice-vdagentd/spice-vdagent-sock
ListenStream=/run/spice-vdagentd/spice-vdagent-sock
# spice-vdagentd needs this and does not create it itself
d /var/run/spice-vdagentd 0755 root root -
d /run/spice-vdagentd 0755 root root -
......@@ -23,7 +23,7 @@
#ifndef __VDAGENTD_PROTO_H
#define __VDAGENTD_PROTO_H
#define VDAGENTD_SOCKET "/var/run/spice-vdagentd/spice-vdagent-sock"
#define VDAGENTD_SOCKET "/run/spice-vdagentd/spice-vdagent-sock"
#define DEFAULT_VIRTIO_PORT_PATH "/dev/virtio-ports/com.redhat.spice.0"
......
......@@ -56,7 +56,7 @@ struct agent_data {
};
/* variables */
static const char *pidfilename = "/var/run/spice-vdagentd/spice-vdagentd.pid";
static const char *pidfilename = "/run/spice-vdagentd/spice-vdagentd.pid";
static gchar *portdev = NULL;
static gchar *vdagentd_socket = NULL;
......
......@@ -54,8 +54,8 @@ void vdagentd_write_xorg_conf(VDAgentMonitorsConfig *monitor_conf)
.subvendor_id = PCI_MATCH_ANY,
.subdevice_id = PCI_MATCH_ANY,
};
const char *xorg_conf = "/var/run/spice-vdagentd/xorg.conf.spice";
const char *xorg_conf_old = "/var/run/spice-vdagentd/xorg.conf.spice.old";
const char *xorg_conf = "/run/spice-vdagentd/xorg.conf.spice";
const char *xorg_conf_old = "/run/spice-vdagentd/xorg.conf.spice.old";
r = rename(xorg_conf, xorg_conf_old);
if (r && errno != ENOENT) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment