summaryrefslogtreecommitdiff
path: root/suse-xendomains-service.patch
diff options
context:
space:
mode:
Diffstat (limited to 'suse-xendomains-service.patch')
-rw-r--r--suse-xendomains-service.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/suse-xendomains-service.patch b/suse-xendomains-service.patch
new file mode 100644
index 0000000..ae8cd82
--- /dev/null
+++ b/suse-xendomains-service.patch
@@ -0,0 +1,20 @@
+xendomains: remove libvirtd conflict
+
+Conflicting with libvirtd is fine for upstream, where xl/libxl is king.
+But down the SUSE stream, we promote libvirt and all the libvirt-based
+tools. If a user installs libvirt on their SUSE Xen host, then libvirt
+should be king and override xendomains.
+
+bsc#1015348
+Index: xen-4.8.0-testing/tools/hotplug/Linux/systemd/xendomains.service.in
+===================================================================
+--- xen-4.8.0-testing.orig/tools/hotplug/Linux/systemd/xendomains.service.in
++++ xen-4.8.0-testing/tools/hotplug/Linux/systemd/xendomains.service.in
+@@ -5,7 +5,6 @@ After=proc-xen.mount xenstored.service x
+ After=network-online.target
+ After=remote-fs.target
+ ConditionPathExists=/proc/xen/capabilities
+-Conflicts=libvirtd.service
+
+ [Service]
+ Type=oneshot