External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-02 04:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

systemd: Make service_extra_in/socket_extra_in required

Browse Source 
We want at least one file to always be present, so that it can
serve as a pointer for users. Ensure that this is the case by
unconditionally using the value of the respective keys.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Andrea Bolognani 2023-09-29 15:59:34 +02:00
parent 95e6615cd2
commit e73b0a1209
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/meson.build
View File

@ -207,8 +207,8 @@ systemd_service_oomscoreadjust_extra_in = files('virtd.service.oomscoreadjust.ex
# * sockets - array of additional sockets (optional, default [ 'main', 'ro', 'admin' ]) # * sockets - array of additional sockets (optional, default [ 'main', 'ro', 'admin' ])
# * service_in - service source file (optional, default virtd.service.in) # * service_in - service source file (optional, default virtd.service.in)
# * socket_$name_in - additional socket source files (optional, default virtd.socket.in or virtd-$name.socket.in) # * socket_$name_in - additional socket source files (optional, default virtd.socket.in or virtd-$name.socket.in)
# * service_extra_in - units to merge with service_in (optional, default []) # * service_extra_in - units to merge with service_in (required)
# * socket_extra_in - units to merge with socket_$name_in (optional, default []) # * socket_extra_in - units to merge with socket_$name_in (required)
virt_daemon_units = [] virt_daemon_units = []
# openrc_init_files # openrc_init_files
@ -830,14 +830,12 @@ if conf.has('WITH_LIBVIRTD')
service_in = unit.get('service_in', service_in_default) service_in = unit.get('service_in', service_in_default)
service_out = '@0@.service'.format(unit['service']) service_out = '@0@.service'.format(unit['service'])
if 'service_extra_in' in unit service_in = configure_file(
service_in = configure_file( input: [ service_in ] + unit['service_extra_in'],
input: [ service_in ] + unit['service_extra_in'], output: '@0@.in'.format(service_out),
output: '@0@.in'.format(service_out), command: [ merge_systemd_units_prog, '@INPUT@' ],
command: [ merge_systemd_units_prog, '@INPUT@' ], capture: true,
capture: true, )
)
endif
configure_file( configure_file(
input: service_in, input: service_in,
@ -858,14 +856,12 @@ if conf.has('WITH_LIBVIRTD')
socket_out = '@0@-@1@.socket'.format(unit['service'], socket) socket_out = '@0@-@1@.socket'.format(unit['service'], socket)
endif endif
if 'socket_extra_in' in unit socket_in = configure_file(
socket_in = configure_file( input: [ socket_in ] + unit['socket_extra_in'],
input: [ socket_in ] + unit['socket_extra_in'], output: '@0@.in'.format(socket_out),
output: '@0@.in'.format(socket_out), command: [ merge_systemd_units_prog, '@INPUT@' ],
command: [ merge_systemd_units_prog, '@INPUT@' ], capture: true,
capture: true, )
)
endif
configure_file( configure_file(
input: socket_in, input: socket_in,