Skip to content
Snippets Groups Projects
Commit 38fde156 authored by Guido Günther's avatar Guido Günther
Browse files

rediff Debian specific patches

parent 3eee3470
No related branches found
No related tags found
No related merge requests found
......@@ -8,10 +8,10 @@ Subject: [PATCH] qemu-disable-network.diff
2 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/qemud/Makefile.am b/qemud/Makefile.am
index a0c161a..0e736d0 100644
index 924e8ad..436b396 100644
--- a/qemud/Makefile.am
+++ b/qemud/Makefile.am
@@ -152,9 +152,6 @@ install-data-local: install-init install-data-sasl install-data-polkit \
@@ -155,9 +155,6 @@ install-data-local: install-init install-data-sasl install-data-polkit \
test -z "$(UUID)" || \
sed -i -e "s,</name>,</name>\n <uuid>$(UUID)</uuid>," \
$(DESTDIR)$(sysconfdir)/$(default_xml_dest)
......@@ -22,10 +22,10 @@ index a0c161a..0e736d0 100644
mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt
mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt
diff --git a/qemud/Makefile.in b/qemud/Makefile.in
index ac4bfdc..5a22dc9 100644
index 99afa00..9711335 100644
--- a/qemud/Makefile.in
+++ b/qemud/Makefile.in
@@ -1291,9 +1291,6 @@ remote_protocol.c: remote_protocol.h
@@ -1295,9 +1295,6 @@ remote_protocol.c: remote_protocol.h
@WITH_LIBVIRTD_TRUE@ test -z "$(UUID)" || \
@WITH_LIBVIRTD_TRUE@ sed -i -e "s,</name>,</name>\n <uuid>$(UUID)</uuid>," \
@WITH_LIBVIRTD_TRUE@ $(DESTDIR)$(sysconfdir)/$(default_xml_dest)
......
......@@ -7,7 +7,7 @@ Subject: [PATCH] allow libvirt group to access the socket
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/qemud/libvirtd.conf b/qemud/libvirtd.conf
index 4932084..2e9b3f6 100644
index 1fd5918..a26c081 100644
--- a/qemud/libvirtd.conf
+++ b/qemud/libvirtd.conf
@@ -78,7 +78,7 @@
......@@ -26,9 +26,9 @@ index 4932084..2e9b3f6 100644
-#unix_sock_rw_perms = "0770"
+unix_sock_rw_perms = "0770"
@@ -125,7 +125,7 @@
# Set the name of the directory in which sockets will be found/created.
#unix_sock_dir = "/var/run/libvirt"
@@ -126,7 +126,7 @@
#
# To restrict monitoring of domains you may wish to enable
# an authentication mechanism here
......@@ -37,7 +37,7 @@ index 4932084..2e9b3f6 100644
# Set an authentication scheme for UNIX read-write sockets
# By default socket permissions only allow root. If PolicyKit
@@ -134,7 +134,7 @@
@@ -135,7 +135,7 @@
#
# If the unix_sock_rw_perms are changed you may wish to enable
# an authentication mechanism here
......
......@@ -8,10 +8,10 @@ Closes: #517059
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/xen_internal.c b/src/xen_internal.c
index 89081ea..5ccef3a 100644
index a866af1..51902b2 100644
--- a/src/xen_internal.c
+++ b/src/xen_internal.c
@@ -2168,7 +2168,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
@@ -2188,7 +2188,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
"/usr/lib64/xen/bin/qemu-dm" :
"/usr/lib/xen/bin/qemu-dm"),
(guest_archs[i].hvm ?
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment