systemd: Tweak service definitions

Use a consistent style everywhere.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/locking/meson.build b/src/locking/meson.build
index 71e628de040ad2b549e74532a01a1ba5dce05cda..ff1578cfcb87c924025cd4f618b6169012bcb8a6 100644 (file)
--- 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 f538a663fbc118baaa82629847b78d3f5997e83b..4d98113ac718a381bd27b6bcb193a598662afafc 100644 (file)
--- 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 6ea157902823486904d734f8f96521276a44b133..498f7ff1b898d7b4770320301cdc0dbef674a4aa 100644 (file)
--- 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'),