From d3bdfa09115303fb562c71aceee4587754b1e247 Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Fri, 29 Sep 2023 15:56:17 +0200 Subject: [PATCH] systemd: Tweak service definitions Use a consistent style everywhere. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- src/locking/meson.build | 2 +- src/logging/meson.build | 2 +- src/remote/meson.build | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/locking/meson.build b/src/locking/meson.build index 71e628de04..ff1578cfcb 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -143,13 +143,13 @@ if conf.has('WITH_LIBVIRTD') virt_daemon_units += { 'service': 'virtlockd', + 'name': 'locking', 'service_in': files('virtlockd.service.in'), 'service_extra_in': [ files('virtlockd.service.extra.in'), systemd_service_oomscoreadjust_extra_in, systemd_service_limitnofile_extra_in, ], - 'name': 'locking', 'sockets': [ 'main', 'admin' ], 'socket_in': files('virtlockd.socket.in'), 'socket_admin_in': files('virtlockd-admin.socket.in'), diff --git a/src/logging/meson.build b/src/logging/meson.build index f538a663fb..4d98113ac7 100644 --- a/src/logging/meson.build +++ b/src/logging/meson.build @@ -90,13 +90,13 @@ if conf.has('WITH_LIBVIRTD') virt_daemon_units += { 'service': 'virtlogd', + 'name': 'logging', 'service_in': files('virtlogd.service.in'), 'service_extra_in': [ files('virtlogd.service.extra.in'), systemd_service_oomscoreadjust_extra_in, systemd_service_limitnofile_extra_in, ], - 'name': 'logging', 'sockets': [ 'main', 'admin' ], 'socket_in': files('virtlogd.socket.in'), 'socket_admin_in': files('virtlogd-admin.socket.in'), diff --git a/src/remote/meson.build b/src/remote/meson.build index 6ea1579028..498f7ff1b8 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -190,6 +190,7 @@ if conf.has('WITH_REMOTE') virt_daemon_units += { 'service': 'libvirtd', + 'name': 'legacy monolithic', 'service_in': files('libvirtd.service.in'), 'service_extra_in': [ files('libvirtd.service.extra.in'), @@ -197,7 +198,6 @@ if conf.has('WITH_REMOTE') systemd_service_tasksmax_extra_in, systemd_service_limitmemlock_extra_in, ], - 'name': 'legacy monolithic', 'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ], 'socket_in': files('libvirtd.socket.in'), 'socket_ro_in': files('libvirtd-ro.socket.in'),