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>

diff --git a/src/ch/meson.build b/src/ch/meson.build
index 0ef7288257e5c46026dc789af8052afa26c84588..df246ef9b0ca6d408de13ec7f7d0c00fad93f68a 100644 (file)
--- a/src/ch/meson.build
+++ b/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'),
   }
 

diff --git a/src/interface/meson.build b/src/interface/meson.build
index 54c0b1a935566b8336471644245c81e249df0c7b..b1617d83e66ce8affd301d6667aa3f80ff1f675d 100644 (file)
--- a/src/interface/meson.build
+++ b/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 += {

diff --git a/src/libxl/meson.build b/src/libxl/meson.build
index 171d6ca00518244872cd111d0073853b76f4fcba..8e6f45513914e0c0fe6677921bbb7a6272f5075b 100644 (file)
--- a/src/libxl/meson.build
+++ b/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'),
   }

diff --git a/src/locking/meson.build b/src/locking/meson.build
index 2ccc822ed3cc02112db6989a57bc7df7a1a6839a..6b3cd781d1875ba84982c2618f5b52bf20de5d89 100644 (file)
--- a/src/locking/meson.build
+++ b/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'),

diff --git a/src/locking/virtlockd-admin.socket.in b/src/locking/virtlockd-admin.socket.in
index 0452a0cfdbff85ff12068ff861dc91b503c860b4..ed5b94edbabfd2b2c590ed6e6f2669c1f10b470a 100644 (file)
--- a/src/locking/virtlockd-admin.socket.in
+++ b/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
 

diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
index 20b4b26f35f1ba4f6b15f3152eae97b4f19662b0..290a2887a59e1caa2bc62e8392c22fee9bcebfad 100644 (file)
--- a/src/locking/virtlockd.service.in
+++ b/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

diff --git a/src/locking/virtlockd.socket.in b/src/locking/virtlockd.socket.in
index 31a576aa1647379771c7d0a24d00ee4b2277ea0b..4eec90a95e08d59f5745fe0d284193d3eabb5883 100644 (file)
--- a/src/locking/virtlockd.socket.in
+++ b/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

diff --git a/src/logging/meson.build b/src/logging/meson.build
index 95d2ef2a3f206b02a212a33b758c31097085df71..1527f91faf88332f93772c1cc0910353b5a90e7e 100644 (file)
--- a/src/logging/meson.build
+++ b/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'),

diff --git a/src/logging/virtlogd-admin.socket.in b/src/logging/virtlogd-admin.socket.in
index ddb9a1393bb06bb1d0125df6e657403bf424e4db..72078780084383c277575ca672fc845706171cc0 100644 (file)
--- a/src/logging/virtlogd-admin.socket.in
+++ b/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
 

diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
index 776d753e9af4f94f263c3f737661bb7c21dcbb6f..4289ef1cb4b59c66ae336f800b027e2c96d3be66 100644 (file)
--- a/src/logging/virtlogd.service.in
+++ b/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

diff --git a/src/logging/virtlogd.socket.in b/src/logging/virtlogd.socket.in
index 084cbe179d0b62cb7a181f30ee99dd97353f2fef..e1d6e30e4d4500266547286260ce3a64675d6216 100644 (file)
--- a/src/logging/virtlogd.socket.in
+++ b/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

diff --git a/src/lxc/meson.build b/src/lxc/meson.build
index 84e6c313eac9e78d93e6fad3181e731e366d16cd..5eb23fbbbf1a7d2e25bf60b2677d42bed9490227 100644 (file)
--- a/src/lxc/meson.build
+++ b/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'),
   }
 

diff --git a/src/network/meson.build b/src/network/meson.build
index ed7707c71463dce0159d03c754bc32ce614bdbf6..d0383cca1c1a01a9be117d1f666d83f45d2e8fe5 100644 (file)
--- a/src/network/meson.build
+++ b/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'),
   }
 

diff --git a/src/node_device/meson.build b/src/node_device/meson.build
index 2614ff8b9c15604307404325983c01cb0278d277..d1e349bc5ec6b621d2c1b33398ab7a91b94753b6 100644 (file)
--- a/src/node_device/meson.build
+++ b/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 += {

diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build
index c091bc3f1b256fb1c6f2813814e1f654005ae147..1b914f2360bbe02b3472f33a01cb4ea561faaf00 100644 (file)
--- a/src/nwfilter/meson.build
+++ b/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 += {

diff --git a/src/qemu/meson.build b/src/qemu/meson.build
index 1afc301a6d72788f09ee237c1358b46e9afb843c..64c62e584f22c4a888ea8f811fdabb914801252b 100644 (file)
--- a/src/qemu/meson.build
+++ b/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'),
   }
 

diff --git a/src/remote/libvirtd-admin.socket.in b/src/remote/libvirtd-admin.socket.in
index e0bbf9b1ace3fca597c46a4183e30c9140a69ceb..37efc11357be44d27dad1248712acac7770479d7 100644 (file)
--- a/src/remote/libvirtd-admin.socket.in
+++ b/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
 

diff --git a/src/remote/libvirtd-ro.socket.in b/src/remote/libvirtd-ro.socket.in
index c8adc8109b6e593a5a7f06335d6cc7d2734adc12..6e1fad22722368423581cef7f44fd5c889ad56d6 100644 (file)
--- a/src/remote/libvirtd-ro.socket.in
+++ b/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
 

diff --git a/src/remote/libvirtd-tcp.socket.in b/src/remote/libvirtd-tcp.socket.in
index 8b8fbcd01aff36607db64da1f76f9ec549dced85..9bdb47285e26519244cf8cd8fc2ac881aae5bd5d 100644 (file)
--- a/src/remote/libvirtd-tcp.socket.in
+++ b/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
 

diff --git a/src/remote/libvirtd-tls.socket.in b/src/remote/libvirtd-tls.socket.in
index fefda22c6b901ba52a2581868b7bd873b2793389..3b10c3e4c2c4c1a91da2a636befb24328c512d5b 100644 (file)
--- a/src/remote/libvirtd-tls.socket.in
+++ b/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
 

diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
index a2c3c8f8fa8ae31fbe1e36e22c2d23c691bf0d3b..9e303f29c80c8ac7d98d80105bef2b8c29f77776 100644 (file)
--- a/src/remote/libvirtd.service.in
+++ b/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

diff --git a/src/remote/libvirtd.socket.in b/src/remote/libvirtd.socket.in
index f483facdf3ec4e3a2a08c9e38762b3c858b11885..9cd37dc7667c1d40161cd41102aa646f12c22e72 100644 (file)
--- a/src/remote/libvirtd.socket.in
+++ b/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

diff --git a/src/remote/meson.build b/src/remote/meson.build
index 5ee6d4e61cc00e16ba81bef89e1040caf4af6044..e14541f09eb447be91ecf2bb575c53655a57af53 100644 (file)
--- a/src/remote/meson.build
+++ b/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' ],
     }

diff --git a/src/secret/meson.build b/src/secret/meson.build
index e05b46abead8cff3c691f4bcfb1ecf3c2fe8f7b7..791ce1a0248eda7a75a8644ca059805ce82a87fd 100644 (file)
--- a/src/secret/meson.build
+++ b/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 += {

diff --git a/src/storage/meson.build b/src/storage/meson.build
index fb7feea81db8ed86817dd29d124c5296620e5af2..023353c1d6035ee81b63327bc351eee4e1977573 100644 (file)
--- a/src/storage/meson.build
+++ b/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'),
   }
 

diff --git a/src/vbox/meson.build b/src/vbox/meson.build
index ee6efbdb42049d9a621461c3f136ed1821776d9a..a72c1833f1ad8cfaba3b57fbb2fb09d19ffa43af 100644 (file)
--- a/src/vbox/meson.build
+++ b/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'),
   }
 

diff --git a/src/virtd-admin.socket.in b/src/virtd-admin.socket.in
index 818d4ab84fbb8cc37de0db0903fd9c0d3dc7a548..63eabd70f86435b6b662129a32628dd0c3b68f83 100644 (file)
--- a/src/virtd-admin.socket.in
+++ b/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

diff --git a/src/virtd-ro.socket.in b/src/virtd-ro.socket.in
index 57b313e01673e934931d42494993ff9f028e6fb5..3284af5a4ab9d320c8e3705eadc156f008b1cd82 100644 (file)
--- a/src/virtd-ro.socket.in
+++ b/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

diff --git a/src/virtd-tcp.socket.in b/src/virtd-tcp.socket.in
index 10480d64e329ffb17a23df865817a8734841f960..f58cb0b358ebae1217ee3cdfcb3e81c641d27d33 100644 (file)
--- a/src/virtd-tcp.socket.in
+++ b/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

diff --git a/src/virtd-tls.socket.in b/src/virtd-tls.socket.in
index 83a1e343bca32da277bf631040477c47ea1c4507..135bf6e1370d023b1cf4d416dafda298dd54d787 100644 (file)
--- a/src/virtd-tls.socket.in
+++ b/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

diff --git a/src/virtd.service.in b/src/virtd.service.in
index e1a5814b13b31cf8017647522d51eb62b79a22ae..91ac4478bd8fa4343789bf9e5e7a134d86d10a63 100644 (file)
--- a/src/virtd.service.in
+++ b/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

diff --git a/src/virtd.socket.in b/src/virtd.socket.in
index 7a8c4bf0c2c46f81b2cdada63e7715b2e7a699da..502c792e7dcfcd55b7d4335898ed3f708279788f 100644 (file)
--- a/src/virtd.socket.in
+++ b/src/virtd.socket.in
@@ -1,5 +1,5 @@
 [Unit]
-Description=@name@ local socket
+Description=libvirt @name@ daemon socket
 Conflicts=libvirtd.socket
 After=libvirtd.socket
 

diff --git a/src/vz/meson.build b/src/vz/meson.build
index 842cdb61360d13503a7d9ab5ac7505a1a646d5d7..ce2cbae454cc85fd3b13ebbb684c49dabafb9d04 100644 (file)
--- a/src/vz/meson.build
+++ b/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'),
   }