systemd: Improve and unify unit descriptions

Hypervisors are referred to by their user-facing name rather
than the name of their libvirt driver, the monolithic daemon is
explicitly referred to as legacy, and a consistent format is
used throughout.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

src/ch/meson.build

@@ -57,7 +57,7 @@ if conf.has('WITH_CH')
 
   virt_daemon_units += {
     'service': 'virtchd',
-    'name': 'Libvirt ch',
+    'name': 'Cloud Hypervisor',
     'service_extra_in': files('virtchd.service.extra.in'),
   }
 

src/interface/meson.build

@@ -44,7 +44,7 @@ if conf.has('WITH_INTERFACE')
 
   virt_daemon_units += {
     'service': 'virtinterfaced',
-    'name': 'Libvirt interface',
+    'name': 'interface',
   }
 
   openrc_init_files += {

src/libxl/meson.build

@@ -66,7 +66,7 @@ if conf.has('WITH_LIBXL')
 
   virt_daemon_units += {
     'service': 'virtxend',
-    'name': 'Libvirt libxl',
+    'name': 'Xen',
     'service_extra_in': files('virtxend.service.extra.in'),
     'socket_extra_in': files('virtxend.socket.extra.in'),
   }

src/locking/meson.build

@@ -144,7 +144,7 @@ if conf.has('WITH_LIBVIRTD')
   virt_daemon_units += {
     'service': 'virtlockd',
     'service_in': files('virtlockd.service.in'),
-    'name': 'Libvirt locking',
+    'name': 'locking',
     'sockets': [ 'main', 'admin' ],
     'socket_in': files('virtlockd.socket.in'),
     'socket_admin_in': files('virtlockd-admin.socket.in'),

src/locking/virtlockd-admin.socket.in

@@ -1,5 +1,5 @@
 [Unit]
-Description=Virtual machine lock manager admin socket
+Description=libvirt locking daemon admin socket
 BindsTo=virtlockd.socket
 After=virtlockd.socket
 

src/locking/virtlockd.service.in

@@ -1,5 +1,5 @@
 [Unit]
-Description=Virtual machine lock manager
+Description=libvirt locking daemon
 BindsTo=virtlockd.socket
 Wants=virtlockd-admin.socket
 After=virtlockd.socket

src/locking/virtlockd.socket.in

@@ -1,5 +1,5 @@
 [Unit]
-Description=Virtual machine lock manager socket
+Description=libvirt locking daemon socket
 
 [Socket]
 ListenStream=@runstatedir@/libvirt/virtlockd-sock

src/logging/meson.build

@@ -91,7 +91,7 @@ if conf.has('WITH_LIBVIRTD')
   virt_daemon_units += {
     'service': 'virtlogd',
     'service_in': files('virtlogd.service.in'),
-    'name': 'Libvirt logging',
+    'name': 'logging',
     'sockets': [ 'main', 'admin' ],
     'socket_in': files('virtlogd.socket.in'),
     'socket_admin_in': files('virtlogd-admin.socket.in'),

src/logging/virtlogd-admin.socket.in

@@ -1,5 +1,5 @@
 [Unit]
-Description=Virtual machine log manager socket
+Description=libvirt logging daemon admin socket
 BindsTo=virtlogd.socket
 After=virtlogd.socket
 

src/logging/virtlogd.service.in

@@ -1,5 +1,5 @@
 [Unit]
-Description=Virtual machine log manager
+Description=libvirt logging daemon
 BindsTo=virtlogd.socket
 Wants=virtlogd-admin.socket
 After=virtlogd.socket

src/logging/virtlogd.socket.in

@@ -1,5 +1,5 @@
 [Unit]
-Description=Virtual machine log manager socket
+Description=libvirt logging daemon socket
 
 [Socket]
 ListenStream=@runstatedir@/libvirt/virtlogd-sock

src/lxc/meson.build

@@ -164,7 +164,7 @@ if conf.has('WITH_LXC')
 
   virt_daemon_units += {
     'service': 'virtlxcd',
-    'name': 'Libvirt lxc',
+    'name': 'LXC',
     'service_extra_in': files('virtlxcd.service.extra.in'),
   }
 

src/network/meson.build

@@ -62,7 +62,7 @@ if conf.has('WITH_NETWORK')
 
   virt_daemon_units += {
     'service': 'virtnetworkd',
-    'name': 'Libvirt network',
+    'name': 'network',
     'service_extra_in': files('virtnetworkd.service.extra.in'),
   }
 

src/node_device/meson.build

@@ -52,7 +52,7 @@ if conf.has('WITH_NODE_DEVICES')
 
   virt_daemon_units += {
     'service': 'virtnodedevd',
-    'name': 'Libvirt nodedev',
+    'name': 'nodedev',
   }
 
   openrc_init_files += {

src/nwfilter/meson.build

@@ -50,7 +50,7 @@ if conf.has('WITH_NWFILTER')
 
   virt_daemon_units += {
     'service': 'virtnwfilterd',
-    'name': 'Libvirt nwfilter',
+    'name': 'nwfilter',
   }
 
   openrc_init_files += {

src/qemu/meson.build

@@ -183,7 +183,7 @@ if conf.has('WITH_QEMU')
 
   virt_daemon_units += {
     'service': 'virtqemud',
-    'name': 'Libvirt qemu',
+    'name': 'QEMU',
     'service_extra_in': files('virtqemud.service.extra.in'),
   }
 

src/remote/libvirtd-admin.socket.in

@@ -1,5 +1,5 @@
 [Unit]
-Description=@name@ admin socket
+Description=libvirt legacy monolithic daemon admin socket
 BindsTo=libvirtd.socket
 After=libvirtd.socket
 

src/remote/libvirtd-ro.socket.in

@@ -1,5 +1,5 @@
 [Unit]
-Description=@name@ local read-only socket
+Description=libvirt legacy monolithic daemon read-only socket
 BindsTo=libvirtd.socket
 After=libvirtd.socket
 

src/remote/libvirtd-tcp.socket.in

@@ -1,5 +1,5 @@
 [Unit]
-Description=@name@ non-TLS IP socket
+Description=libvirt legacy monolithic daemon non-TLS IP socket
 BindsTo=libvirtd.socket
 After=libvirtd.socket
 

src/remote/libvirtd-tls.socket.in

@@ -1,5 +1,5 @@
 [Unit]
-Description=@name@ TLS IP socket
+Description=libvirt legacy monolithic daemon TLS IP socket
 BindsTo=libvirtd.socket
 After=libvirtd.socket
 

src/remote/libvirtd.service.in

@@ -1,5 +1,5 @@
 [Unit]
-Description=Virtualization daemon
+Description=libvirt legacy monolithic daemon
 # Use Wants instead of Requires so that users
 # can disable these three .socket units to revert
 # to a traditional non-activation deployment setup

src/remote/libvirtd.socket.in

@@ -1,5 +1,5 @@
 [Unit]
-Description=@name@ local socket
+Description=libvirt legacy monolithic daemon socket
 
 [Socket]
 ListenStream=@runstatedir@/libvirt/libvirt-sock

src/remote/meson.build

@@ -191,7 +191,7 @@ if conf.has('WITH_REMOTE')
     virt_daemon_units += {
       'service': 'libvirtd',
       'service_in': files('libvirtd.service.in'),
-      'name': 'Libvirt',
+      'name': 'legacy monolithic',
       'sockprefix': 'libvirt',
       'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ],
       'socket_in': files('libvirtd.socket.in'),
@@ -224,7 +224,7 @@ if conf.has('WITH_REMOTE')
 
     virt_daemon_units += {
       'service': 'virtproxyd',
-      'name': 'Libvirt proxy',
+      'name': 'proxy',
       'sockprefix': 'libvirt',
       'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ],
     }

src/secret/meson.build

@@ -33,7 +33,7 @@ if conf.has('WITH_SECRETS')
 
   virt_daemon_units += {
     'service': 'virtsecretd',
-    'name': 'Libvirt secret',
+    'name': 'secret',
   }
 
   openrc_init_files += {

src/storage/meson.build

@@ -111,7 +111,7 @@ if conf.has('WITH_STORAGE')
 
   virt_daemon_units += {
     'service': 'virtstoraged',
-    'name': 'Libvirt storage',
+    'name': 'storage',
     'service_extra_in': files('virtstoraged.service.extra.in'),
   }
 

src/vbox/meson.build

@@ -57,7 +57,7 @@ if conf.has('WITH_VBOX')
 
   virt_daemon_units += {
     'service': 'virtvboxd',
-    'name': 'Libvirt vbox',
+    'name': 'VirtualBox',
     'service_extra_in': files('virtvboxd.service.extra.in'),
   }
 

src/virtd-admin.socket.in

@@ -1,5 +1,5 @@
 [Unit]
-Description=@name@ admin socket
+Description=libvirt @name@ daemon admin socket
 BindsTo=@service@.socket
 After=@service@.socket
 Conflicts=libvirtd-admin.socket

src/virtd-ro.socket.in

@@ -1,5 +1,5 @@
 [Unit]
-Description=@name@ local read-only socket
+Description=libvirt @name@ daemon read-only socket
 BindsTo=@service@.socket
 After=@service@.socket
 Conflicts=libvirtd-ro.socket

src/virtd-tcp.socket.in

@@ -1,5 +1,5 @@
 [Unit]
-Description=@name@ non-TLS IP socket
+Description=libvirt @name@ daemon non-TLS IP socket
 BindsTo=@service@.socket
 After=@service@.socket
 Conflicts=libvirtd-tcp.socket

src/virtd-tls.socket.in

@@ -1,5 +1,5 @@
 [Unit]
-Description=@name@ TLS IP socket
+Description=libvirt @name@ daemon TLS IP socket
 BindsTo=@service@.socket
 After=@service@.socket
 Conflicts=libvirtd-tls.socket

src/virtd.service.in

@@ -1,5 +1,5 @@
 [Unit]
-Description=@name@ daemon
+Description=libvirt @name@ daemon
 BindsTo=@service@.socket
 Wants=@service@-ro.socket
 Wants=@service@-admin.socket

src/virtd.socket.in

@@ -1,5 +1,5 @@
 [Unit]
-Description=@name@ local socket
+Description=libvirt @name@ daemon socket
 Conflicts=libvirtd.socket
 After=libvirtd.socket
 

src/vz/meson.build

@@ -48,7 +48,7 @@ if conf.has('WITH_VZ')
 
   virt_daemon_units += {
     'service': 'virtvzd',
-    'name': 'Libvirt vz',
+    'name': 'vz',
     'service_extra_in': files('virtvzd.service.extra.in'),
   }