Commit 58888e97 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

run files must be in /run instead of /var/run

parent 534d3981
all:
tar xf libvirt-5.4.0.tar.xz
patch -Np1 -d libvirt-5.4.0 < libvirt-5.4.0-run_dir_fix.patch
cd libvirt-5.4.0 && ./autogen.sh
cd libvirt-5.4.0 && ./configure --prefix=/usr
$(MAKE) -C libvirt-5.4.0
......
diff -uNr libvirt-5.4.0/src/libvirtd.8.in libvirt-5.4.0-run_dir_fix/src/libvirtd.8.in
--- libvirt-5.4.0/src/libvirtd.8.in 2018-02-26 19:35:04.570662092 +1030
+++ libvirt-5.4.0-run_dir_fix/src/libvirtd.8.in 2020-11-04 16:30:59.300147102 +1030
@@ -200,11 +200,11 @@
.IX Item "@sysconfdir@/libvirt/libvirtd.conf"
The default configuration file used by libvirtd, unless overridden on the
command line using the \fB\-f\fR|\fB\-\-config\fR option.
-.IP "\fI@localstatedir@/run/libvirt/libvirt\-sock\fR" 4
-.IX Item "@localstatedir@/run/libvirt/libvirt-sock"
+.IP "\fI/run/libvirt/libvirt\-sock\fR" 4
+.IX Item "/run/libvirt/libvirt-sock"
.PD 0
-.IP "\fI@localstatedir@/run/libvirt/libvirt\-sock\-ro\fR" 4
-.IX Item "@localstatedir@/run/libvirt/libvirt-sock-ro"
+.IP "\fI/run/libvirt/libvirt\-sock\-ro\fR" 4
+.IX Item "/run/libvirt/libvirt-sock-ro"
.PD
The sockets libvirtd will use.
.IP "\fI@sysconfdir@/pki/CA/cacert.pem\fR" 4
@@ -216,8 +216,8 @@
.IP "\fI@sysconfdir@/pki/libvirt/private/serverkey.pem\fR" 4
.IX Item "@sysconfdir@/pki/libvirt/private/serverkey.pem"
The \s-1TLS\s0 \fBServer\fR private key libvirtd will use.
-.IP "\fI@localstatedir@/run/libvirtd.pid\fR" 4
-.IX Item "@localstatedir@/run/libvirtd.pid"
+.IP "\fI/run/libvirtd.pid\fR" 4
+.IX Item "/run/libvirtd.pid"
The \s-1PID\s0 file to use, unless overridden by the \fB\-p\fR|\fB\-\-pid\-file\fR option.
.SS "When run as \fBnon-root\fP."
.IX Subsection "When run as non-root."
@@ -262,8 +262,8 @@
.PP
.Vb 4
\& # libvirtd \-d
-\& # ls \-la @localstatedir@/run/libvirtd.pid
-\& \-rw\-r\-\-r\-\- 1 root root 6 Jul 9 02:40 @localstatedir@/run/libvirtd.pid
+\& # ls \-la /run/libvirtd.pid
+\& \-rw\-r\-\-r\-\- 1 root root 6 Jul 9 02:40 /run/libvirtd.pid
\& #
.Ve
.SH "BUGS"
diff -uNr libvirt-5.4.0/src/locking/virtlockd-admin.socket.in libvirt-5.4.0-run_dir_fix/src/locking/virtlockd-admin.socket.in
--- libvirt-5.4.0/src/locking/virtlockd-admin.socket.in 2019-05-25 16:59:35.114518604 +0930
+++ libvirt-5.4.0-run_dir_fix/src/locking/virtlockd-admin.socket.in 2020-11-04 16:31:40.282273203 +1030
@@ -3,7 +3,7 @@
Before=libvirtd.service
[Socket]
-ListenStream=@localstatedir@/run/libvirt/virtlockd-admin-sock
+ListenStream=/run/libvirt/virtlockd-admin-sock
Service=virtlockd.service
SocketMode=0600
diff -uNr libvirt-5.4.0/src/locking/virtlockd.socket.in libvirt-5.4.0-run_dir_fix/src/locking/virtlockd.socket.in
--- libvirt-5.4.0/src/locking/virtlockd.socket.in 2019-05-25 16:59:35.115518594 +0930
+++ libvirt-5.4.0-run_dir_fix/src/locking/virtlockd.socket.in 2020-11-04 16:31:33.670252970 +1030
@@ -3,7 +3,7 @@
Before=libvirtd.service
[Socket]
-ListenStream=@localstatedir@/run/libvirt/virtlockd-sock
+ListenStream=/run/libvirt/virtlockd-sock
SocketMode=0600
[Install]
diff -uNr libvirt-5.4.0/src/logging/virtlogd-admin.socket.in libvirt-5.4.0-run_dir_fix/src/logging/virtlogd-admin.socket.in
--- libvirt-5.4.0/src/logging/virtlogd-admin.socket.in 2019-05-25 16:59:35.116518585 +0930
+++ libvirt-5.4.0-run_dir_fix/src/logging/virtlogd-admin.socket.in 2020-11-04 16:31:27.429233872 +1030
@@ -3,7 +3,7 @@
Before=libvirtd.service
[Socket]
-ListenStream=@localstatedir@/run/libvirt/virtlogd-admin-sock
+ListenStream=/run/libvirt/virtlogd-admin-sock
Service=virtlogd.service
SocketMode=0600
diff -uNr libvirt-5.4.0/src/logging/virtlogd.socket.in libvirt-5.4.0-run_dir_fix/src/logging/virtlogd.socket.in
--- libvirt-5.4.0/src/logging/virtlogd.socket.in 2019-05-25 16:59:35.116518585 +0930
+++ libvirt-5.4.0-run_dir_fix/src/logging/virtlogd.socket.in 2020-11-04 16:31:21.300215116 +1030
@@ -3,7 +3,7 @@
Before=libvirtd.service
[Socket]
-ListenStream=@localstatedir@/run/libvirt/virtlogd-sock
+ListenStream=/run/libvirt/virtlogd-sock
SocketMode=0600
[Install]
diff -uNr libvirt-5.4.0/src/virtlockd.8.in libvirt-5.4.0-run_dir_fix/src/virtlockd.8.in
--- libvirt-5.4.0/src/virtlockd.8.in 2017-10-30 18:05:33.270866193 +1030
+++ libvirt-5.4.0-run_dir_fix/src/virtlockd.8.in 2020-11-04 16:30:47.839111400 +1030
@@ -189,11 +189,11 @@
.IX Item "@sysconfdir@/libvirt/virtlockd.conf"
The default configuration file used by virtlockd, unless overridden on the
command line using the \fB\-f\fR|\fB\-\-config\fR option.
-.IP "\fI@localstatedir@/run/libvirt/virtlockd\-sock\fR" 4
-.IX Item "@localstatedir@/run/libvirt/virtlockd-sock"
+.IP "\fI/run/libvirt/virtlockd\-sock\fR" 4
+.IX Item "/run/libvirt/virtlockd-sock"
The sockets libvirtd will use.
-.IP "\fI@localstatedir@/run/virtlockd.pid\fR" 4
-.IX Item "@localstatedir@/run/virtlockd.pid"
+.IP "\fI/run/virtlockd.pid\fR" 4
+.IX Item "/run/virtlockd.pid"
The \s-1PID\s0 file to use, unless overridden by the \fB\-p\fR|\fB\-\-pid\-file\fR option.
.SS "When run as \fBnon-root\fP."
.IX Subsection "When run as non-root."
@@ -229,8 +229,8 @@
.PP
.Vb 4
\& # virtlockd \-d
-\& # ls \-la @localstatedir@/run/virtlockd.pid
-\& \-rw\-r\-\-r\-\- 1 root root 6 Jul 9 02:40 @localstatedir@/run/virtlockd.pid
+\& # ls \-la /run/virtlockd.pid
+\& \-rw\-r\-\-r\-\- 1 root root 6 Jul 9 02:40 /run/virtlockd.pid
\& #
.Ve
.SH "BUGS"
diff -uNr libvirt-5.4.0/src/virtlogd.8.in libvirt-5.4.0-run_dir_fix/src/virtlogd.8.in
--- libvirt-5.4.0/src/virtlogd.8.in 2017-10-30 18:05:33.336865502 +1030
+++ libvirt-5.4.0-run_dir_fix/src/virtlogd.8.in 2020-11-04 16:31:09.974180352 +1030
@@ -189,11 +189,11 @@
.IX Item "@sysconfdir@/libvirt/virtlogd.conf"
The default configuration file used by virtlogd, unless overridden on the
command line using the \fB\-f\fR|\fB\-\-config\fR option.
-.IP "\fI@localstatedir@/run/libvirt/virtlogd\-sock\fR" 4
-.IX Item "@localstatedir@/run/libvirt/virtlogd-sock"
+.IP "\fI/run/libvirt/virtlogd\-sock\fR" 4
+.IX Item "/run/libvirt/virtlogd-sock"
The sockets libvirtd will use.
-.IP "\fI@localstatedir@/run/virtlogd.pid\fR" 4
-.IX Item "@localstatedir@/run/virtlogd.pid"
+.IP "\fI/run/virtlogd.pid\fR" 4
+.IX Item "/run/virtlogd.pid"
The \s-1PID\s0 file to use, unless overridden by the \fB\-p\fR|\fB\-\-pid\-file\fR option.
.SS "When run as \fBnon-root\fP."
.IX Subsection "When run as non-root."
@@ -229,8 +229,8 @@
.PP
.Vb 4
\& # virtlogd \-d
-\& # ls \-la @localstatedir@/run/virtlogd.pid
-\& \-rw\-r\-\-r\-\- 1 root root 6 Jul 9 02:40 @localstatedir@/run/virtlogd.pid
+\& # ls \-la /run/virtlogd.pid
+\& \-rw\-r\-\-r\-\- 1 root root 6 Jul 9 02:40 /run/virtlogd.pid
\& #
.Ve
.SH "BUGS"
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