Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

libvirt: fix control socket path #14274

Merged
merged 1 commit into from
Sep 8, 2019
Merged

libvirt: fix control socket path #14274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions srcpkgs/libvirt/patches/socket-url-arguments.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git src/remote/remote_daemon.c src/remote/remote_daemon.c
index 546328b24d..5d64397062 100644
--- src/remote/remote_daemon.c
+++ src/remote/remote_daemon.c
@@ -226,14 +226,14 @@ daemonUnixSocketPaths(struct daemonConfig *config,

if (config->unix_sock_dir) {
if (virAsprintf(sockfile, "%s/%s-sock",
- SOCK_PREFIX, config->unix_sock_dir) < 0)
+ config->unix_sock_dir, SOCK_PREFIX) < 0)
goto cleanup;

if (privileged) {
if (virAsprintf(rosockfile, "%s/%s-sock-ro",
- SOCK_PREFIX, config->unix_sock_dir) < 0 ||
+ config->unix_sock_dir, SOCK_PREFIX) < 0 ||
virAsprintf(admsockfile, "%s/%s-admin-sock",
- SOCK_PREFIX, config->unix_sock_dir) < 0)
+ config->unix_sock_dir, SOCK_PREFIX) < 0)
goto cleanup;
}
} else {
2 changes: 1 addition & 1 deletion srcpkgs/libvirt/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'libvirt'
pkgname=libvirt
version=5.7.0
revision=1
revision=2
build_style=gnu-configure
configure_args="--without-hal --with-storage-lvm --with-qemu
--with-qemu-user=libvirt --with-qemu-group=libvirt --without-netcf
Expand Down