mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-09 14:35:25 +00:00
b9a063cd8e
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>
71 lines
1.4 KiB
Meson
71 lines
1.4 KiB
Meson
nwfilter_driver_sources = [
|
|
'nwfilter_driver.c',
|
|
'nwfilter_gentech_driver.c',
|
|
'nwfilter_dhcpsnoop.c',
|
|
'nwfilter_ebiptables_driver.c',
|
|
'nwfilter_learnipaddr.c',
|
|
]
|
|
|
|
driver_source_files += files(nwfilter_driver_sources)
|
|
stateful_driver_source_files += files(nwfilter_driver_sources)
|
|
|
|
if conf.has('WITH_NWFILTER')
|
|
nwfilter_driver_impl = static_library(
|
|
'virt_driver_nwfilter_impl',
|
|
[
|
|
nwfilter_driver_sources,
|
|
],
|
|
dependencies: [
|
|
access_dep,
|
|
libnl_dep,
|
|
libpcap_dep,
|
|
src_dep,
|
|
],
|
|
include_directories: [
|
|
conf_inc_dir,
|
|
],
|
|
)
|
|
|
|
virt_modules += {
|
|
'name': 'virt_driver_nwfilter',
|
|
'link_whole': [
|
|
nwfilter_driver_impl,
|
|
],
|
|
'link_args': [
|
|
libvirt_no_undefined,
|
|
],
|
|
}
|
|
|
|
virt_daemons += {
|
|
'name': 'virtnwfilterd',
|
|
'c_args': [
|
|
'-DDAEMON_NAME="virtnwfilterd"',
|
|
'-DMODULE_NAME="nwfilter"',
|
|
],
|
|
}
|
|
|
|
virt_daemon_confs += {
|
|
'name': 'virtnwfilterd',
|
|
}
|
|
|
|
virt_daemon_units += {
|
|
'service': 'virtnwfilterd',
|
|
'service_in': files('virtnwfilterd.service.in'),
|
|
'name': 'Libvirt nwfilter',
|
|
'sockprefix': 'virtnwfilterd',
|
|
'sockets': [ 'main', 'ro', 'admin' ],
|
|
}
|
|
|
|
openrc_init_files += {
|
|
'name': 'virtnwfilterd',
|
|
'in_file': files('virtnwfilterd.init.in'),
|
|
}
|
|
|
|
sysconf_files += {
|
|
'name': 'virtnwfilterd',
|
|
'file': files('virtnwfilterd.sysconf'),
|
|
}
|
|
|
|
subdir('xml')
|
|
endif
|