External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Remove unused 'conflicts' key from virt_daemon_unit

Browse Source 
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>
This commit is contained in:
Jim Fehlig 2021-02-09 11:21:04 -07:00
parent 3f1f784575
commit b9a063cd8e
12 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/interface/meson.build
View File

@ -48,7 +48,6 @@ if conf.has('WITH_INTERFACE')
'name': 'Libvirt interface', 'name': 'Libvirt interface',
'sockprefix': 'virtinterfaced', 'sockprefix': 'virtinterfaced',
'sockets': [ 'main', 'ro', 'admin' ], 'sockets': [ 'main', 'ro', 'admin' ],
'conflicts': true,
} }
openrc_init_files += { openrc_init_files += {

1
src/libxl/meson.build
View File

@ -71,7 +71,6 @@ if conf.has('WITH_LIBXL')
'sockprefix': 'virtxend', 'sockprefix': 'virtxend',
'sockets': [ 'main', 'ro', 'admin' ], 'sockets': [ 'main', 'ro', 'admin' ],
'deps': 'ConditionPathExists=/proc/xen/capabilities', 'deps': 'ConditionPathExists=/proc/xen/capabilities',
'conflicts': true,
} }
openrc_init_files += { openrc_init_files += {

1
src/lxc/meson.build
View File

@ -168,7 +168,6 @@ if conf.has('WITH_LXC')
'name': 'Libvirt lxc', 'name': 'Libvirt lxc',
'sockprefix': 'virtlxcd', 'sockprefix': 'virtlxcd',
'sockets': [ 'main', 'ro', 'admin' ], 'sockets': [ 'main', 'ro', 'admin' ],
'conflicts': true,
} }
openrc_init_files += { openrc_init_files += {

1
src/meson.build
View File

@ -201,7 +201,6 @@ guest_unit_files = []
# * sockets - array of additional sockets (optional, default [ 'main', 'ro', 'admin' ]) # * sockets - array of additional sockets (optional, default [ 'main', 'ro', 'admin' ])
# * socket_$name_in - additional socket source files (optional, default remote/libvirtd.socket.in ) # * socket_$name_in - additional socket source files (optional, default remote/libvirtd.socket.in )
# * deps - socket dependencies (optional, default '') # * deps - socket dependencies (optional, default '')
# * conflicts - if the service conflicts with libvirtd (optional, true)
virt_daemon_units = [] virt_daemon_units = []
# openrc_init_files # openrc_init_files

1
src/network/meson.build
View File

@ -65,7 +65,6 @@ if conf.has('WITH_NETWORK')
'name': 'Libvirt network', 'name': 'Libvirt network',
'sockprefix': 'virtnetworkd', 'sockprefix': 'virtnetworkd',
'sockets': [ 'main', 'ro', 'admin' ], 'sockets': [ 'main', 'ro', 'admin' ],
'conflicts': true,
} }
openrc_init_files += { openrc_init_files += {

1
src/node_device/meson.build
View File

@ -56,7 +56,6 @@ if conf.has('WITH_NODE_DEVICES')
'name': 'Libvirt nodedev', 'name': 'Libvirt nodedev',
'sockprefix': 'virtnodedevd', 'sockprefix': 'virtnodedevd',
'sockets': [ 'main', 'ro', 'admin' ], 'sockets': [ 'main', 'ro', 'admin' ],
'conflicts': true,
} }
openrc_init_files += { openrc_init_files += {

1
src/nwfilter/meson.build
View File

@ -54,7 +54,6 @@ if conf.has('WITH_NWFILTER')
'name': 'Libvirt nwfilter', 'name': 'Libvirt nwfilter',
'sockprefix': 'virtnwfilterd', 'sockprefix': 'virtnwfilterd',
'sockets': [ 'main', 'ro', 'admin' ], 'sockets': [ 'main', 'ro', 'admin' ],
'conflicts': true,
} }
openrc_init_files += { openrc_init_files += {

1
src/qemu/meson.build
View File

@ -158,7 +158,6 @@ if conf.has('WITH_QEMU')
'name': 'Libvirt qemu', 'name': 'Libvirt qemu',
'sockprefix': 'virtqemud', 'sockprefix': 'virtqemud',
'sockets': [ 'main', 'ro', 'admin' ], 'sockets': [ 'main', 'ro', 'admin' ],
'conflicts': true,
} }
openrc_init_files += { openrc_init_files += {

1
src/secret/meson.build
View File

@ -37,7 +37,6 @@ if conf.has('WITH_SECRETS')
'name': 'Libvirt secret', 'name': 'Libvirt secret',
'sockprefix': 'virtsecretd', 'sockprefix': 'virtsecretd',
'sockets': [ 'main', 'ro', 'admin' ], 'sockets': [ 'main', 'ro', 'admin' ],
'conflicts': true,
} }
openrc_init_files += { openrc_init_files += {

1
src/storage/meson.build
View File

@ -119,7 +119,6 @@ if conf.has('WITH_STORAGE')
'name': 'Libvirt storage', 'name': 'Libvirt storage',
'sockprefix': 'virtstoraged', 'sockprefix': 'virtstoraged',
'sockets': [ 'main', 'ro', 'admin' ], 'sockets': [ 'main', 'ro', 'admin' ],
'conflicts': true,
} }
openrc_init_files += { openrc_init_files += {

1
src/vbox/meson.build
View File

@ -62,7 +62,6 @@ if conf.has('WITH_VBOX')
'name': 'Libvirt vbox', 'name': 'Libvirt vbox',
'sockprefix': 'virtvboxd', 'sockprefix': 'virtvboxd',
'sockets': [ 'main', 'ro', 'admin' ], 'sockets': [ 'main', 'ro', 'admin' ],
'conflicts': true,
} }
openrc_init_files += { openrc_init_files += {

1
src/vz/meson.build
View File

@ -52,7 +52,6 @@ if conf.has('WITH_VZ')
'name': 'Libvirt vz', 'name': 'Libvirt vz',
'sockprefix': 'virtvzd', 'sockprefix': 'virtvzd',
'sockets': [ 'main', 'ro', 'admin' ], 'sockets': [ 'main', 'ro', 'admin' ],
'conflicts': true,
} }
openrc_init_files += { openrc_init_files += {