21 lines
806 B
Diff
21 lines
806 B
Diff
|
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
|