From: Andrea Bolognani Date: Mon, 25 Sep 2023 14:57:25 +0000 (+0200) Subject: systemd: Rename socket_in_def -> socket_in_default X-Git-Tag: v9.8.0-rc2~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6922526dbbae35f5de3d1ecec2ce967a07d43c73;p=thirdparty%2Flibvirt.git systemd: Rename socket_in_def -> socket_in_default The meaning of the _def suffix might not be immediately obvious, especially since it's also used to refer to the output of the meson-gen-def.py script elsewhere in the same file. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrangé --- diff --git a/src/meson.build b/src/meson.build index 28e4d0cc4e..7b6ce6d32f 100644 --- a/src/meson.build +++ b/src/meson.build @@ -826,12 +826,12 @@ if conf.has('WITH_LIBVIRTD') foreach socket : unit.get('sockets', [ 'main', 'ro', 'admin' ]) if socket == 'main' - socket_in_def = 'remote' / 'libvirtd.socket.in' - socket_in = unit.get('socket_in', socket_in_def) + socket_in_default = 'remote' / 'libvirtd.socket.in' + socket_in = unit.get('socket_in', socket_in_default) socket_out = '@0@.socket'.format(unit['service']) else - socket_in_def = 'remote' / 'libvirtd-@0@.socket.in'.format(socket) - socket_in = unit.get('socket_@0@_in'.format(socket), socket_in_def) + socket_in_default = 'remote' / 'libvirtd-@0@.socket.in'.format(socket) + socket_in = unit.get('socket_@0@_in'.format(socket), socket_in_default) socket_out = '@0@-@1@.socket'.format(unit['service'], socket) endif configure_file(