mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 21:55:25 +00:00
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>
This commit is contained in:
parent
3f1f784575
commit
b9a063cd8e
@ -48,7 +48,6 @@ if conf.has('WITH_INTERFACE')
|
||||
'name': 'Libvirt interface',
|
||||
'sockprefix': 'virtinterfaced',
|
||||
'sockets': [ 'main', 'ro', 'admin' ],
|
||||
'conflicts': true,
|
||||
}
|
||||
|
||||
openrc_init_files += {
|
||||
|
@ -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 += {
|
||||
|
@ -168,7 +168,6 @@ if conf.has('WITH_LXC')
|
||||
'name': 'Libvirt lxc',
|
||||
'sockprefix': 'virtlxcd',
|
||||
'sockets': [ 'main', 'ro', 'admin' ],
|
||||
'conflicts': true,
|
||||
}
|
||||
|
||||
openrc_init_files += {
|
||||
|
@ -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
|
||||
|
@ -65,7 +65,6 @@ if conf.has('WITH_NETWORK')
|
||||
'name': 'Libvirt network',
|
||||
'sockprefix': 'virtnetworkd',
|
||||
'sockets': [ 'main', 'ro', 'admin' ],
|
||||
'conflicts': true,
|
||||
}
|
||||
|
||||
openrc_init_files += {
|
||||
|
@ -56,7 +56,6 @@ if conf.has('WITH_NODE_DEVICES')
|
||||
'name': 'Libvirt nodedev',
|
||||
'sockprefix': 'virtnodedevd',
|
||||
'sockets': [ 'main', 'ro', 'admin' ],
|
||||
'conflicts': true,
|
||||
}
|
||||
|
||||
openrc_init_files += {
|
||||
|
@ -54,7 +54,6 @@ if conf.has('WITH_NWFILTER')
|
||||
'name': 'Libvirt nwfilter',
|
||||
'sockprefix': 'virtnwfilterd',
|
||||
'sockets': [ 'main', 'ro', 'admin' ],
|
||||
'conflicts': true,
|
||||
}
|
||||
|
||||
openrc_init_files += {
|
||||
|
@ -158,7 +158,6 @@ if conf.has('WITH_QEMU')
|
||||
'name': 'Libvirt qemu',
|
||||
'sockprefix': 'virtqemud',
|
||||
'sockets': [ 'main', 'ro', 'admin' ],
|
||||
'conflicts': true,
|
||||
}
|
||||
|
||||
openrc_init_files += {
|
||||
|
@ -37,7 +37,6 @@ if conf.has('WITH_SECRETS')
|
||||
'name': 'Libvirt secret',
|
||||
'sockprefix': 'virtsecretd',
|
||||
'sockets': [ 'main', 'ro', 'admin' ],
|
||||
'conflicts': true,
|
||||
}
|
||||
|
||||
openrc_init_files += {
|
||||
|
@ -119,7 +119,6 @@ if conf.has('WITH_STORAGE')
|
||||
'name': 'Libvirt storage',
|
||||
'sockprefix': 'virtstoraged',
|
||||
'sockets': [ 'main', 'ro', 'admin' ],
|
||||
'conflicts': true,
|
||||
}
|
||||
|
||||
openrc_init_files += {
|
||||
|
@ -62,7 +62,6 @@ if conf.has('WITH_VBOX')
|
||||
'name': 'Libvirt vbox',
|
||||
'sockprefix': 'virtvboxd',
|
||||
'sockets': [ 'main', 'ro', 'admin' ],
|
||||
'conflicts': true,
|
||||
}
|
||||
|
||||
openrc_init_files += {
|
||||
|
@ -52,7 +52,6 @@ if conf.has('WITH_VZ')
|
||||
'name': 'Libvirt vz',
|
||||
'sockprefix': 'virtvzd',
|
||||
'sockets': [ 'main', 'ro', 'admin' ],
|
||||
'conflicts': true,
|
||||
}
|
||||
|
||||
openrc_init_files += {
|
||||
|
Loading…
Reference in New Issue
Block a user