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@xxxxxxxxxx>
---
src/ch/meson.build | 2 +-
src/interface/meson.build | 2 +-
src/libxl/meson.build | 2 +-
src/locking/meson.build | 2 +-
src/locking/virtlockd-admin.socket.in | 2 +-
src/locking/virtlockd.service.in | 2 +-
src/locking/virtlockd.socket.in | 2 +-
src/logging/meson.build | 2 +-
src/logging/virtlogd-admin.socket.in | 2 +-
src/logging/virtlogd.service.in | 2 +-
src/logging/virtlogd.socket.in | 2 +-
src/lxc/meson.build | 2 +-
src/network/meson.build | 2 +-
src/node_device/meson.build | 2 +-
src/nwfilter/meson.build | 2 +-
src/qemu/meson.build | 2 +-
src/remote/libvirtd-admin.socket.in | 2 +-
src/remote/libvirtd-ro.socket.in | 2 +-
src/remote/libvirtd-tcp.socket.in | 2 +-
src/remote/libvirtd-tls.socket.in | 2 +-
src/remote/libvirtd.service.in | 2 +-
src/remote/libvirtd.socket.in | 2 +-
src/remote/meson.build | 4 ++--
src/secret/meson.build | 2 +-
src/storage/meson.build | 2 +-
src/vbox/meson.build | 2 +-
src/virtd-admin.socket.in | 2 +-
src/virtd-ro.socket.in | 2 +-
src/virtd-tcp.socket.in | 2 +-
src/virtd-tls.socket.in | 2 +-
src/virtd.service.in | 2 +-
src/virtd.socket.in | 2 +-
src/vz/meson.build | 2 +-
33 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/ch/meson.build b/src/ch/meson.build
index f6c443f3c6..cbac6e2de6 100644
--- 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_unit_extra': [
'Wants=systemd-machined.service',
'After=systemd-machined.service',
diff --git a/src/interface/meson.build b/src/interface/meson.build
index 54c0b1a935..b1617d83e6 100644
--- 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 ad8d9b757f..5affd1e7c5 100644
--- 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_unit_extra': [
'Wants=virtlockd.socket',
'After=virtlockd.socket',
diff --git a/src/locking/meson.build b/src/locking/meson.build
index 2ccc822ed3..6b3cd781d1 100644
--- 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 a773b511bd..90077b4915 100644
--- 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 @name@ daemon admin socket
[Socket]
ListenStream=@runstatedir@/libvirt/virtlockd-admin-sock
diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
index ebf8cb9d5a..d1ebbda2b7 100644
--- a/src/locking/virtlockd.service.in
+++ b/src/locking/virtlockd.service.in
@@ -1,5 +1,5 @@
[Unit]
-Description=Virtual machine lock manager
+Description=libvirt @name@ daemon
BindsTo=virtlockd.socket
BindsTo=virtlockd-admin.socket
After=virtlockd.socket
diff --git a/src/locking/virtlockd.socket.in b/src/locking/virtlockd.socket.in
index 1cd50c70ec..5dba9dea00 100644
--- 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 @name@ daemon socket
[Socket]
ListenStream=@runstatedir@/libvirt/virtlockd-sock
diff --git a/src/logging/meson.build b/src/logging/meson.build
index 95d2ef2a3f..1527f91faf 100644
--- 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 e0d35cbcf3..34f27154a2 100644
--- 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 @name@ daemon admin socket
[Socket]
ListenStream=@runstatedir@/libvirt/virtlogd-admin-sock
diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
index 72743a61ae..bfcc43d1b7 100644
--- a/src/logging/virtlogd.service.in
+++ b/src/logging/virtlogd.service.in
@@ -1,5 +1,5 @@
[Unit]
-Description=Virtual machine log manager
+Description=libvirt @name@ daemon
BindsTo=virtlogd.socket
BindsTo=virtlogd-admin.socket
After=virtlogd.socket
diff --git a/src/logging/virtlogd.socket.in b/src/logging/virtlogd.socket.in
index 0b85af927b..218d30e5ec 100644
--- 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 @name@ daemon socket
[Socket]
ListenStream=@runstatedir@/libvirt/virtlogd-sock
diff --git a/src/lxc/meson.build b/src/lxc/meson.build
index 9b933023dd..8e513c870d 100644
--- 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_unit_extra': [
'Wants=systemd-machined.service',
'After=systemd-machined.service',
diff --git a/src/network/meson.build b/src/network/meson.build
index d1a2338d1b..1974385ca9 100644
--- 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_service_extra': [
'KillMode=process',
],
diff --git a/src/node_device/meson.build b/src/node_device/meson.build
index 2614ff8b9c..d1e349bc5e 100644
--- 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 c091bc3f1b..1b914f2360 100644
--- 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 bf900e3f14..2a4a8836e2 100644
--- 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_unit_extra': [
'Requires=virtlogd.socket',
'Wants=virtlockd.socket',
diff --git a/src/remote/libvirtd-admin.socket.in b/src/remote/libvirtd-admin.socket.in
index ba060eaea4..7d7416618c 100644
--- 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 @name@ daemon admin socket
[Socket]
ListenStream=@runstatedir@/libvirt/libvirt-admin-sock
diff --git a/src/remote/libvirtd-ro.socket.in b/src/remote/libvirtd-ro.socket.in
index d2ab7ba4f2..cdbebcd2e8 100644
--- 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 @name@ daemon read-only socket
[Socket]
ListenStream=@runstatedir@/libvirt/libvirt-sock-ro
diff --git a/src/remote/libvirtd-tcp.socket.in b/src/remote/libvirtd-tcp.socket.in
index e32daddf25..d0da35b8bb 100644
--- 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 @name@ daemon non-TLS IP socket
[Socket]
ListenStream=16509
diff --git a/src/remote/libvirtd-tls.socket.in b/src/remote/libvirtd-tls.socket.in
index 2f34e8e0cd..d95da1558b 100644
--- 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 @name@ daemon TLS IP socket
[Socket]
ListenStream=16514
diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
index a2c3c8f8fa..3b9819c3bc 100644
--- a/src/remote/libvirtd.service.in
+++ b/src/remote/libvirtd.service.in
@@ -1,5 +1,5 @@
[Unit]
-Description=Virtualization daemon
+Description=libvirt @name@ 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 f483facdf3..cab3cfe971 100644
--- a/src/remote/libvirtd.socket.in
+++ b/src/remote/libvirtd.socket.in
@@ -1,5 +1,5 @@
[Unit]
-Description=@name@ local socket
+Description=libvirt @name@ daemon socket
[Socket]
ListenStream=@runstatedir@/libvirt/libvirt-sock
diff --git a/src/remote/meson.build b/src/remote/meson.build
index 5ee6d4e61c..e14541f09e 100644
--- 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 e05b46abea..791ce1a024 100644
--- 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 90b8af4e41..b01e8acd18 100644
--- 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_unit_extra': [
'After=iscsid.service',
'After=remote-fs.target',
diff --git a/src/vbox/meson.build b/src/vbox/meson.build
index e07c87eaaa..ad41ec21ee 100644
--- 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_unit_extra': [
'After=remote-fs.target',
],
diff --git a/src/virtd-admin.socket.in b/src/virtd-admin.socket.in
index dc2cb737ce..6c2d7eed7a 100644
--- 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
Conflicts=libvirtd-admin.socket
After=libvirtd-admin.socket
@socket_unit_extra@
diff --git a/src/virtd-ro.socket.in b/src/virtd-ro.socket.in
index ef1716e3f3..316468bf54 100644
--- 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
Conflicts=libvirtd-ro.socket
After=libvirtd-ro.socket
@socket_unit_extra@
diff --git a/src/virtd-tcp.socket.in b/src/virtd-tcp.socket.in
index 26ead32789..928760b872 100644
--- 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
Conflicts=libvirtd-tcp.socket
After=libvirtd-tcp.socket
@socket_unit_extra@
diff --git a/src/virtd-tls.socket.in b/src/virtd-tls.socket.in
index 47da9317d6..4532038c8d 100644
--- 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
Conflicts=libvirt-tls.socket
After=libvirt-tls.socket
@socket_unit_extra@
diff --git a/src/virtd.service.in b/src/virtd.service.in
index b9e6345e8c..e940b05b19 100644
--- 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
BindsTo=@service@-ro.socket
BindsTo=@service@-admin.socket
diff --git a/src/virtd.socket.in b/src/virtd.socket.in
index dc25e4d781..920d537e06 100644
--- 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
@socket_unit_extra@
diff --git a/src/vz/meson.build b/src/vz/meson.build
index dceea1aaac..077c1f37fd 100644
--- 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_unit_extra': [
'After=remote-fs.target',
],
--
2.41.0
