> Commit 098268a33c7c8008ccec9050aea8f0763f1c06d5 (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 <mail@xxxxxxxx>
Acked-by: Frediano Ziglio <fziglio@xxxxxxxxxx>
> ---
> README | 2 +-
> data/spice-vdagentd | 4 ++--
> data/spice-vdagentd.socket | 2 +-
> data/tmpfiles.d/spice-vdagentd.conf | 2 +-
> src/vdagentd-proto.h | 2 +-
> src/vdagentd/vdagentd.c | 2 +-
> src/vdagentd/xorg-conf.c | 4 ++--
> 7 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/README b/README
> index 2eefbc4..cb2e5b9 100644
> --- a/README
> +++ b/README
> @@ -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
> diff --git a/data/spice-vdagentd b/data/spice-vdagentd
> index 306de6b..3070a04 100755
> --- a/data/spice-vdagentd
> +++ b/data/spice-vdagentd
> @@ -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=$?
> diff --git a/data/spice-vdagentd.socket b/data/spice-vdagentd.socket
> index adace91..9123bd2 100644
> --- a/data/spice-vdagentd.socket
> +++ b/data/spice-vdagentd.socket
> @@ -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
> diff --git a/data/tmpfiles.d/spice-vdagentd.conf
> b/data/tmpfiles.d/spice-vdagentd.conf
> index 1a79963..417b84b 100644
> --- a/data/tmpfiles.d/spice-vdagentd.conf
> +++ b/data/tmpfiles.d/spice-vdagentd.conf
> @@ -1,2 +1,2 @@
> # 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 -
> diff --git a/src/vdagentd-proto.h b/src/vdagentd-proto.h
> index f72a890..197f325 100644
> --- a/src/vdagentd-proto.h
> +++ b/src/vdagentd-proto.h
> @@ -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"
>
> diff --git a/src/vdagentd/vdagentd.c b/src/vdagentd/vdagentd.c
> index f5ba3c2..d0f771a 100644
> --- a/src/vdagentd/vdagentd.c
> +++ b/src/vdagentd/vdagentd.c
> @@ -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;
> diff --git a/src/vdagentd/xorg-conf.c b/src/vdagentd/xorg-conf.c
> index 97aaacb..463f891 100644
> --- a/src/vdagentd/xorg-conf.c
> +++ b/src/vdagentd/xorg-conf.c
> @@ -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) {
>
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel