12:38 p.m.
The 'conflict' key in a virt_daemon_unit dictionary is not used when
generating systemd service and socket files. The comment associated
with the key claims the default is 'true', and a few build files
needlessly set it to 'true' when defining their virt_daemon_unit.
Remove the 'conflict' key and its use in the affect build files.
Signed-off-by: Jim Fehlig <jfehlig(a)suse.com>
---
src/interface/meson.build | 1 -
src/libxl/meson.build | 1 -
src/lxc/meson.build | 1 -
src/meson.build | 1 -
src/network/meson.build | 1 -
src/node_device/meson.build | 1 -
src/nwfilter/meson.build | 1 -
src/qemu/meson.build | 1 -
src/secret/meson.build | 1 -
src/storage/meson.build | 1 -
src/vbox/meson.build | 1 -
src/vz/meson.build | 1 -
12 files changed, 12 deletions(-)
diff --git a/src/interface/meson.build b/src/interface/meson.build
index 1092c5a267..2d4e30362c 100644
--- a/src/interface/meson.build
+++ b/src/interface/meson.build
@@ -48,7 +48,6 @@ if conf.has('WITH_INTERFACE')
'name': 'Libvirt interface',
'sockprefix': 'virtinterfaced',
'sockets': [ 'main', 'ro', 'admin' ],
- 'conflicts': true,
}
openrc_init_files += {
diff --git a/src/libxl/meson.build b/src/libxl/meson.build
index 783af6c667..9793899106 100644
--- a/src/libxl/meson.build
+++ b/src/libxl/meson.build
@@ -71,7 +71,6 @@ if conf.has('WITH_LIBXL')
'sockprefix': 'virtxend',
'sockets': [ 'main', 'ro', 'admin' ],
'deps': 'ConditionPathExists=/proc/xen/capabilities',
- 'conflicts': true,
}
openrc_init_files += {
diff --git a/src/lxc/meson.build b/src/lxc/meson.build
index f8e2a8852a..ad5c659dba 100644
--- a/src/lxc/meson.build
+++ b/src/lxc/meson.build
@@ -168,7 +168,6 @@ if conf.has('WITH_LXC')
'name': 'Libvirt lxc',
'sockprefix': 'virtlxcd',
'sockets': [ 'main', 'ro', 'admin' ],
- 'conflicts': true,
}
openrc_init_files += {
diff --git a/src/meson.build b/src/meson.build
index 74d932a32c..f13b85b74e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -201,7 +201,6 @@ guest_unit_files = []
# * sockets - array of additional sockets (optional, default [ 'main',
'ro', 'admin' ])
# * socket_$name_in - additional socket source files (optional, default
remote/libvirtd.socket.in )
# * deps - socket dependencies (optional, default '')
-# * conflicts - if the service conflicts with libvirtd (optional, true)
virt_daemon_units = []
# openrc_init_files
diff --git a/src/network/meson.build b/src/network/meson.build
index 3ec598c3f9..d6fb624bb7 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -65,7 +65,6 @@ if conf.has('WITH_NETWORK')
'name': 'Libvirt network',
'sockprefix': 'virtnetworkd',
'sockets': [ 'main', 'ro', 'admin' ],
- 'conflicts': true,
}
openrc_init_files += {
diff --git a/src/node_device/meson.build b/src/node_device/meson.build
index c4e4c3906b..15f9c3ad29 100644
--- a/src/node_device/meson.build
+++ b/src/node_device/meson.build
@@ -56,7 +56,6 @@ if conf.has('WITH_NODE_DEVICES')
'name': 'Libvirt nodedev',
'sockprefix': 'virtnodedevd',
'sockets': [ 'main', 'ro', 'admin' ],
- 'conflicts': true,
}
openrc_init_files += {
diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build
index 715282ee77..a21e575925 100644
--- a/src/nwfilter/meson.build
+++ b/src/nwfilter/meson.build
@@ -54,7 +54,6 @@ if conf.has('WITH_NWFILTER')
'name': 'Libvirt nwfilter',
'sockprefix': 'virtnwfilterd',
'sockets': [ 'main', 'ro', 'admin' ],
- 'conflicts': true,
}
openrc_init_files += {
diff --git a/src/qemu/meson.build b/src/qemu/meson.build
index 08c1d20087..3898d23877 100644
--- a/src/qemu/meson.build
+++ b/src/qemu/meson.build
@@ -158,7 +158,6 @@ if conf.has('WITH_QEMU')
'name': 'Libvirt qemu',
'sockprefix': 'virtqemud',
'sockets': [ 'main', 'ro', 'admin' ],
- 'conflicts': true,
}
openrc_init_files += {
diff --git a/src/secret/meson.build b/src/secret/meson.build
index d576d3218e..a487055cde 100644
--- a/src/secret/meson.build
+++ b/src/secret/meson.build
@@ -37,7 +37,6 @@ if conf.has('WITH_SECRETS')
'name': 'Libvirt secret',
'sockprefix': 'virtsecretd',
'sockets': [ 'main', 'ro', 'admin' ],
- 'conflicts': true,
}
openrc_init_files += {
diff --git a/src/storage/meson.build b/src/storage/meson.build
index 153ff6f846..915ae46f61 100644
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -119,7 +119,6 @@ if conf.has('WITH_STORAGE')
'name': 'Libvirt storage',
'sockprefix': 'virtstoraged',
'sockets': [ 'main', 'ro', 'admin' ],
- 'conflicts': true,
}
openrc_init_files += {
diff --git a/src/vbox/meson.build b/src/vbox/meson.build
index 3e608fa101..df0cfb40e8 100644
--- a/src/vbox/meson.build
+++ b/src/vbox/meson.build
@@ -62,7 +62,6 @@ if conf.has('WITH_VBOX')
'name': 'Libvirt vbox',
'sockprefix': 'virtvboxd',
'sockets': [ 'main', 'ro', 'admin' ],
- 'conflicts': true,
}
openrc_init_files += {
diff --git a/src/vz/meson.build b/src/vz/meson.build
index 2859dc7979..14f7280f66 100644
--- a/src/vz/meson.build
+++ b/src/vz/meson.build
@@ -52,7 +52,6 @@ if conf.has('WITH_VZ')
'name': 'Libvirt vz',
'sockprefix': 'virtvzd',
'sockets': [ 'main', 'ro', 'admin' ],
- 'conflicts': true,
}
openrc_init_files += {
--
2.29.2