build: Remove unused 'conflicts' key from virt_daemon_unit

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@suse.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/interface/meson.build b/src/interface/meson.build
index 1092c5a2673b762bcc66c213aea8e06f876803c6..2d4e30362c8d97a0ba5e4a96dc234249bc8ca0bf 100644 (file)
--- 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 783af6c66724014f4d1798cec248d59549b30340..979389910615c49bada10f33a2e18557d0e66874 100644 (file)
--- 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 f8e2a8852ad0d6d770bcb864720c58d4d334443f..ad5c659dba098e900aaa9ac448f1e410c1c63c7b 100644 (file)
--- 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 74d932a32c0f9f153f2526a91386c84c62a80933..f13b85b74e5a99fa93dda517338019204f218879 100644 (file)
--- 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 3ec598c3f944f705d31f15a70227543865bf6a3d..d6fb624bb7825b56b6de7ecb78f0278057079758 100644 (file)
--- 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 c4e4c3906b158ef2f9e208a63220be68d1f932d0..15f9c3ad29dd367e26daae975220f9c1a50f018e 100644 (file)
--- 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 715282ee77e0b4e63179f4c4414782a9c8bd09a5..a21e57592571ea418fc11e85d8f04f2cbe724c08 100644 (file)
--- 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 08c1d20087da3a3cffab97ec16c582c7b3395c03..3898d23877cf3b2d34d63c6127b2421b2d74d16c 100644 (file)
--- 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 d576d3218eb24fb70028e08cfd8fd812d1cd8d43..a487055cde524aff9cd369254454781e446905ae 100644 (file)
--- 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 153ff6f846148bd3f084c96d193ad612452c2623..915ae46f61702db91460c39cb76360771926fa95 100644 (file)
--- 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 3e608fa1018321300ba6192943a582e21a778d80..df0cfb40e804bb5838e011c370861e0104a0f960 100644 (file)
--- 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 2859dc79793a45b2404a23da11582cb6f1526cd4..14f7280f662be9266b671f33923b4b2498504a4d 100644 (file)
--- 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 += {