[libvirt PATCH 09/11] systemd: Set service_extra_in/socket_extra_in everywhere

Andrea Bolognani abologna at redhat.com
Mon Oct 2 08:51:24 UTC 2023


It's somewhat confusing that some of the services have a
corresponding foo.service.extra.in and foo.socket.extra.in, some
have just one of the two, and some have neither.

In order to make things more approachable, make sure that both
files exists for each service.

In most cases the extra units are currently unused, so they will
just contain a comment briefly explaining their purpose and
pointing users to meson.build, where they can find more
information. The same comment is also added to the top of
extra units that already have some contents in them for
consistency.

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
 src/ch/meson.build                            |  3 +++
 src/ch/virtchd.service.extra.in               |  3 +++
 src/ch/virtchd.socket.extra.in                |  2 ++
 src/interface/meson.build                     |  6 ++++++
 src/interface/virtinterfaced.service.extra.in |  2 ++
 src/interface/virtinterfaced.socket.extra.in  |  2 ++
 src/libxl/virtxend.service.extra.in           |  3 +++
 src/libxl/virtxend.socket.extra.in            |  3 +++
 src/locking/meson.build                       |  4 ++++
 src/locking/virtlockd.service.extra.in        |  2 ++
 src/locking/virtlockd.socket.extra.in         |  2 ++
 src/logging/meson.build                       |  4 ++++
 src/logging/virtlogd.service.extra.in         |  2 ++
 src/logging/virtlogd.socket.extra.in          |  2 ++
 src/lxc/meson.build                           |  3 +++
 src/lxc/virtlxcd.service.extra.in             |  3 +++
 src/lxc/virtlxcd.socket.extra.in              |  2 ++
 src/network/meson.build                       |  3 +++
 src/network/virtnetworkd.service.extra.in     |  3 +++
 src/network/virtnetworkd.socket.extra.in      |  2 ++
 src/node_device/meson.build                   |  6 ++++++
 src/node_device/virtnodedevd.service.extra.in |  2 ++
 src/node_device/virtnodedevd.socket.extra.in  |  2 ++
 src/nwfilter/meson.build                      |  6 ++++++
 src/nwfilter/virtnwfilterd.service.extra.in   |  2 ++
 src/nwfilter/virtnwfilterd.socket.extra.in    |  2 ++
 src/qemu/meson.build                          |  3 +++
 src/qemu/virtqemud.service.extra.in           |  3 +++
 src/qemu/virtqemud.socket.extra.in            |  2 ++
 src/remote/libvirtd.service.extra.in          |  2 ++
 src/remote/libvirtd.socket.extra.in           |  2 ++
 src/remote/meson.build                        | 10 ++++++++++
 src/remote/virtproxyd.service.extra.in        |  2 ++
 src/remote/virtproxyd.socket.extra.in         |  2 ++
 src/secret/meson.build                        |  6 ++++++
 src/secret/virtsecretd.service.extra.in       |  2 ++
 src/secret/virtsecretd.socket.extra.in        |  2 ++
 src/storage/meson.build                       |  3 +++
 src/storage/virtstoraged.service.extra.in     |  3 +++
 src/storage/virtstoraged.socket.extra.in      |  2 ++
 src/vbox/meson.build                          |  3 +++
 src/vbox/virtvboxd.service.extra.in           |  3 +++
 src/vbox/virtvboxd.socket.extra.in            |  2 ++
 src/vz/meson.build                            |  3 +++
 src/vz/virtvzd.service.extra.in               |  3 +++
 src/vz/virtvzd.socket.extra.in                |  2 ++
 46 files changed, 136 insertions(+)
 create mode 100644 src/ch/virtchd.socket.extra.in
 create mode 100644 src/interface/virtinterfaced.service.extra.in
 create mode 100644 src/interface/virtinterfaced.socket.extra.in
 create mode 100644 src/locking/virtlockd.service.extra.in
 create mode 100644 src/locking/virtlockd.socket.extra.in
 create mode 100644 src/logging/virtlogd.service.extra.in
 create mode 100644 src/logging/virtlogd.socket.extra.in
 create mode 100644 src/lxc/virtlxcd.socket.extra.in
 create mode 100644 src/network/virtnetworkd.socket.extra.in
 create mode 100644 src/node_device/virtnodedevd.service.extra.in
 create mode 100644 src/node_device/virtnodedevd.socket.extra.in
 create mode 100644 src/nwfilter/virtnwfilterd.service.extra.in
 create mode 100644 src/nwfilter/virtnwfilterd.socket.extra.in
 create mode 100644 src/qemu/virtqemud.socket.extra.in
 create mode 100644 src/remote/libvirtd.service.extra.in
 create mode 100644 src/remote/libvirtd.socket.extra.in
 create mode 100644 src/remote/virtproxyd.service.extra.in
 create mode 100644 src/remote/virtproxyd.socket.extra.in
 create mode 100644 src/secret/virtsecretd.service.extra.in
 create mode 100644 src/secret/virtsecretd.socket.extra.in
 create mode 100644 src/storage/virtstoraged.socket.extra.in
 create mode 100644 src/vbox/virtvboxd.socket.extra.in
 create mode 100644 src/vz/virtvzd.socket.extra.in

diff --git a/src/ch/meson.build b/src/ch/meson.build
index 29e76b6938..335b10ffaf 100644
--- a/src/ch/meson.build
+++ b/src/ch/meson.build
@@ -64,6 +64,9 @@ if conf.has('WITH_CH')
       systemd_service_taskmax_extra_in,
       systemd_service_limitmemlock_extra_in,
     ],
+    'socket_extra_in': [
+      files('virtchd.socket.extra.in'),
+    ],
   }
 
   virt_install_dirs += [
diff --git a/src/ch/virtchd.service.extra.in b/src/ch/virtchd.service.extra.in
index 3655c51130..8a3bc5b34d 100644
--- a/src/ch/virtchd.service.extra.in
+++ b/src/ch/virtchd.service.extra.in
@@ -1,3 +1,6 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
+
 [Unit]
 Wants=systemd-machined.service
 After=systemd-machined.service
diff --git a/src/ch/virtchd.socket.extra.in b/src/ch/virtchd.socket.extra.in
new file mode 100644
index 0000000000..1fc8c672f7
--- /dev/null
+++ b/src/ch/virtchd.socket.extra.in
@@ -0,0 +1,2 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
diff --git a/src/interface/meson.build b/src/interface/meson.build
index b1617d83e6..3d2991315e 100644
--- a/src/interface/meson.build
+++ b/src/interface/meson.build
@@ -45,6 +45,12 @@ if conf.has('WITH_INTERFACE')
   virt_daemon_units += {
     'service': 'virtinterfaced',
     'name': 'interface',
+    'service_extra_in': [
+      files('virtinterfaced.service.extra.in'),
+    ],
+    'socket_extra_in': [
+      files('virtinterfaced.socket.extra.in'),
+    ],
   }
 
   openrc_init_files += {
diff --git a/src/interface/virtinterfaced.service.extra.in b/src/interface/virtinterfaced.service.extra.in
new file mode 100644
index 0000000000..1fc8c672f7
--- /dev/null
+++ b/src/interface/virtinterfaced.service.extra.in
@@ -0,0 +1,2 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
diff --git a/src/interface/virtinterfaced.socket.extra.in b/src/interface/virtinterfaced.socket.extra.in
new file mode 100644
index 0000000000..1fc8c672f7
--- /dev/null
+++ b/src/interface/virtinterfaced.socket.extra.in
@@ -0,0 +1,2 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
diff --git a/src/libxl/virtxend.service.extra.in b/src/libxl/virtxend.service.extra.in
index 55783aa3d5..b367a1db4c 100644
--- a/src/libxl/virtxend.service.extra.in
+++ b/src/libxl/virtxend.service.extra.in
@@ -1,3 +1,6 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
+
 [Unit]
 Wants=virtlockd.socket
 After=virtlockd.socket
diff --git a/src/libxl/virtxend.socket.extra.in b/src/libxl/virtxend.socket.extra.in
index c8322efbbc..fc73809a0e 100644
--- a/src/libxl/virtxend.socket.extra.in
+++ b/src/libxl/virtxend.socket.extra.in
@@ -1,2 +1,5 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
+
 [Unit]
 ConditionPathExists=/proc/xen/capabilities
diff --git a/src/locking/meson.build b/src/locking/meson.build
index d15e2cb84a..71e628de04 100644
--- a/src/locking/meson.build
+++ b/src/locking/meson.build
@@ -145,6 +145,7 @@ if conf.has('WITH_LIBVIRTD')
     'service': 'virtlockd',
     'service_in': files('virtlockd.service.in'),
     'service_extra_in': [
+      files('virtlockd.service.extra.in'),
       systemd_service_oomscoreadjust_extra_in,
       systemd_service_limitnofile_extra_in,
     ],
@@ -152,6 +153,9 @@ if conf.has('WITH_LIBVIRTD')
     'sockets': [ 'main', 'admin' ],
     'socket_in': files('virtlockd.socket.in'),
     'socket_admin_in': files('virtlockd-admin.socket.in'),
+    'socket_extra_in': [
+      files('virtlockd.socket.extra.in'),
+    ],
   }
 
   openrc_init_files += {
diff --git a/src/locking/virtlockd.service.extra.in b/src/locking/virtlockd.service.extra.in
new file mode 100644
index 0000000000..1fc8c672f7
--- /dev/null
+++ b/src/locking/virtlockd.service.extra.in
@@ -0,0 +1,2 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
diff --git a/src/locking/virtlockd.socket.extra.in b/src/locking/virtlockd.socket.extra.in
new file mode 100644
index 0000000000..1fc8c672f7
--- /dev/null
+++ b/src/locking/virtlockd.socket.extra.in
@@ -0,0 +1,2 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
diff --git a/src/logging/meson.build b/src/logging/meson.build
index fbf492b16e..f538a663fb 100644
--- a/src/logging/meson.build
+++ b/src/logging/meson.build
@@ -92,6 +92,7 @@ if conf.has('WITH_LIBVIRTD')
     'service': 'virtlogd',
     'service_in': files('virtlogd.service.in'),
     'service_extra_in': [
+      files('virtlogd.service.extra.in'),
       systemd_service_oomscoreadjust_extra_in,
       systemd_service_limitnofile_extra_in,
     ],
@@ -99,6 +100,9 @@ if conf.has('WITH_LIBVIRTD')
     'sockets': [ 'main', 'admin' ],
     'socket_in': files('virtlogd.socket.in'),
     'socket_admin_in': files('virtlogd-admin.socket.in'),
+    'socket_extra_in': [
+      files('virtlogd.socket.extra.in'),
+    ],
   }
 
   openrc_init_files += {
diff --git a/src/logging/virtlogd.service.extra.in b/src/logging/virtlogd.service.extra.in
new file mode 100644
index 0000000000..1fc8c672f7
--- /dev/null
+++ b/src/logging/virtlogd.service.extra.in
@@ -0,0 +1,2 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
diff --git a/src/logging/virtlogd.socket.extra.in b/src/logging/virtlogd.socket.extra.in
new file mode 100644
index 0000000000..1fc8c672f7
--- /dev/null
+++ b/src/logging/virtlogd.socket.extra.in
@@ -0,0 +1,2 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
diff --git a/src/lxc/meson.build b/src/lxc/meson.build
index 044a38c918..666c6c1311 100644
--- a/src/lxc/meson.build
+++ b/src/lxc/meson.build
@@ -171,6 +171,9 @@ if conf.has('WITH_LXC')
       systemd_service_taskmax_extra_in,
       systemd_service_limitmemlock_extra_in,
     ],
+    'socket_extra_in': [
+      files('virtlxcd.socket.extra.in'),
+    ],
   }
 
   openrc_init_files += {
diff --git a/src/lxc/virtlxcd.service.extra.in b/src/lxc/virtlxcd.service.extra.in
index 3655c51130..8a3bc5b34d 100644
--- a/src/lxc/virtlxcd.service.extra.in
+++ b/src/lxc/virtlxcd.service.extra.in
@@ -1,3 +1,6 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
+
 [Unit]
 Wants=systemd-machined.service
 After=systemd-machined.service
diff --git a/src/lxc/virtlxcd.socket.extra.in b/src/lxc/virtlxcd.socket.extra.in
new file mode 100644
index 0000000000..1fc8c672f7
--- /dev/null
+++ b/src/lxc/virtlxcd.socket.extra.in
@@ -0,0 +1,2 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
diff --git a/src/network/meson.build b/src/network/meson.build
index 3cf2ef3d3d..eb171ae779 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -66,6 +66,9 @@ if conf.has('WITH_NETWORK')
     'service_extra_in': [
       files('virtnetworkd.service.extra.in'),
     ],
+    'socket_extra_in': [
+      files('virtnetworkd.socket.extra.in'),
+    ],
   }
 
   openrc_init_files += {
diff --git a/src/network/virtnetworkd.service.extra.in b/src/network/virtnetworkd.service.extra.in
index 9fcabf652d..546709b7f4 100644
--- a/src/network/virtnetworkd.service.extra.in
+++ b/src/network/virtnetworkd.service.extra.in
@@ -1,2 +1,5 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
+
 [Service]
 KillMode=process
diff --git a/src/network/virtnetworkd.socket.extra.in b/src/network/virtnetworkd.socket.extra.in
new file mode 100644
index 0000000000..1fc8c672f7
--- /dev/null
+++ b/src/network/virtnetworkd.socket.extra.in
@@ -0,0 +1,2 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
diff --git a/src/node_device/meson.build b/src/node_device/meson.build
index d1e349bc5e..d66c02a0e2 100644
--- a/src/node_device/meson.build
+++ b/src/node_device/meson.build
@@ -53,6 +53,12 @@ if conf.has('WITH_NODE_DEVICES')
   virt_daemon_units += {
     'service': 'virtnodedevd',
     'name': 'nodedev',
+    'service_extra_in': [
+      files('virtnodedevd.service.extra.in'),
+    ],
+    'socket_extra_in': [
+      files('virtnodedevd.socket.extra.in'),
+    ],
   }
 
   openrc_init_files += {
diff --git a/src/node_device/virtnodedevd.service.extra.in b/src/node_device/virtnodedevd.service.extra.in
new file mode 100644
index 0000000000..1fc8c672f7
--- /dev/null
+++ b/src/node_device/virtnodedevd.service.extra.in
@@ -0,0 +1,2 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
diff --git a/src/node_device/virtnodedevd.socket.extra.in b/src/node_device/virtnodedevd.socket.extra.in
new file mode 100644
index 0000000000..1fc8c672f7
--- /dev/null
+++ b/src/node_device/virtnodedevd.socket.extra.in
@@ -0,0 +1,2 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build
index 1b914f2360..de3d202267 100644
--- a/src/nwfilter/meson.build
+++ b/src/nwfilter/meson.build
@@ -51,6 +51,12 @@ if conf.has('WITH_NWFILTER')
   virt_daemon_units += {
     'service': 'virtnwfilterd',
     'name': 'nwfilter',
+    'service_extra_in': [
+      files('virtnwfilterd.service.extra.in'),
+    ],
+    'socket_extra_in': [
+      files('virtnwfilterd.socket.extra.in'),
+    ],
   }
 
   openrc_init_files += {
diff --git a/src/nwfilter/virtnwfilterd.service.extra.in b/src/nwfilter/virtnwfilterd.service.extra.in
new file mode 100644
index 0000000000..1fc8c672f7
--- /dev/null
+++ b/src/nwfilter/virtnwfilterd.service.extra.in
@@ -0,0 +1,2 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
diff --git a/src/nwfilter/virtnwfilterd.socket.extra.in b/src/nwfilter/virtnwfilterd.socket.extra.in
new file mode 100644
index 0000000000..1fc8c672f7
--- /dev/null
+++ b/src/nwfilter/virtnwfilterd.socket.extra.in
@@ -0,0 +1,2 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
diff --git a/src/qemu/meson.build b/src/qemu/meson.build
index 167ed849ea..b73c8be0d1 100644
--- a/src/qemu/meson.build
+++ b/src/qemu/meson.build
@@ -190,6 +190,9 @@ if conf.has('WITH_QEMU')
       systemd_service_taskmax_extra_in,
       systemd_service_limitmemlock_extra_in,
     ],
+    'socket_extra_in': [
+      files('virtqemud.socket.extra.in'),
+    ],
   }
 
   openrc_init_files += {
diff --git a/src/qemu/virtqemud.service.extra.in b/src/qemu/virtqemud.service.extra.in
index 32aba8be9c..cc16b6a9bb 100644
--- a/src/qemu/virtqemud.service.extra.in
+++ b/src/qemu/virtqemud.service.extra.in
@@ -1,3 +1,6 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
+
 [Unit]
 Requires=virtlogd.socket
 Wants=virtlockd.socket
diff --git a/src/qemu/virtqemud.socket.extra.in b/src/qemu/virtqemud.socket.extra.in
new file mode 100644
index 0000000000..1fc8c672f7
--- /dev/null
+++ b/src/qemu/virtqemud.socket.extra.in
@@ -0,0 +1,2 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
diff --git a/src/remote/libvirtd.service.extra.in b/src/remote/libvirtd.service.extra.in
new file mode 100644
index 0000000000..1fc8c672f7
--- /dev/null
+++ b/src/remote/libvirtd.service.extra.in
@@ -0,0 +1,2 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
diff --git a/src/remote/libvirtd.socket.extra.in b/src/remote/libvirtd.socket.extra.in
new file mode 100644
index 0000000000..1fc8c672f7
--- /dev/null
+++ b/src/remote/libvirtd.socket.extra.in
@@ -0,0 +1,2 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
diff --git a/src/remote/meson.build b/src/remote/meson.build
index 8b81a813f2..49d19b3cbf 100644
--- a/src/remote/meson.build
+++ b/src/remote/meson.build
@@ -192,6 +192,7 @@ if conf.has('WITH_REMOTE')
       'service': 'libvirtd',
       'service_in': files('libvirtd.service.in'),
       'service_extra_in': [
+        files('libvirtd.service.extra.in'),
         systemd_service_limitnofile_extra_in,
         systemd_service_taskmax_extra_in,
         systemd_service_limitmemlock_extra_in,
@@ -203,6 +204,9 @@ if conf.has('WITH_REMOTE')
       'socket_admin_in': files('libvirtd-admin.socket.in'),
       'socket_tcp_in': files('libvirtd-tcp.socket.in'),
       'socket_tls_in': files('libvirtd-tls.socket.in'),
+      'socket_extra_in': [
+        files('libvirtd.socket.extra.in'),
+      ],
     }
 
     openrc_init_files += {
@@ -229,8 +233,14 @@ if conf.has('WITH_REMOTE')
     virt_daemon_units += {
       'service': 'virtproxyd',
       'name': 'proxy',
+      'service_extra_in': [
+        files('virtproxyd.service.extra.in'),
+      ],
       'sockprefix': 'libvirt',
       'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ],
+      'socket_extra_in': [
+        files('virtproxyd.socket.extra.in'),
+      ],
     }
 
     openrc_init_files += {
diff --git a/src/remote/virtproxyd.service.extra.in b/src/remote/virtproxyd.service.extra.in
new file mode 100644
index 0000000000..1fc8c672f7
--- /dev/null
+++ b/src/remote/virtproxyd.service.extra.in
@@ -0,0 +1,2 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
diff --git a/src/remote/virtproxyd.socket.extra.in b/src/remote/virtproxyd.socket.extra.in
new file mode 100644
index 0000000000..1fc8c672f7
--- /dev/null
+++ b/src/remote/virtproxyd.socket.extra.in
@@ -0,0 +1,2 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
diff --git a/src/secret/meson.build b/src/secret/meson.build
index 791ce1a024..3b859ea7b4 100644
--- a/src/secret/meson.build
+++ b/src/secret/meson.build
@@ -34,6 +34,12 @@ if conf.has('WITH_SECRETS')
   virt_daemon_units += {
     'service': 'virtsecretd',
     'name': 'secret',
+    'service_extra_in': [
+      files('virtsecretd.service.extra.in'),
+    ],
+    'socket_extra_in': [
+      files('virtsecretd.socket.extra.in'),
+    ],
   }
 
   openrc_init_files += {
diff --git a/src/secret/virtsecretd.service.extra.in b/src/secret/virtsecretd.service.extra.in
new file mode 100644
index 0000000000..1fc8c672f7
--- /dev/null
+++ b/src/secret/virtsecretd.service.extra.in
@@ -0,0 +1,2 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
diff --git a/src/secret/virtsecretd.socket.extra.in b/src/secret/virtsecretd.socket.extra.in
new file mode 100644
index 0000000000..1fc8c672f7
--- /dev/null
+++ b/src/secret/virtsecretd.socket.extra.in
@@ -0,0 +1,2 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
diff --git a/src/storage/meson.build b/src/storage/meson.build
index daad8abf25..404d6a6941 100644
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -115,6 +115,9 @@ if conf.has('WITH_STORAGE')
     'service_extra_in': [
       files('virtstoraged.service.extra.in'),
     ],
+    'socket_extra_in': [
+      files('virtstoraged.socket.extra.in'),
+    ],
   }
 
   openrc_init_files += {
diff --git a/src/storage/virtstoraged.service.extra.in b/src/storage/virtstoraged.service.extra.in
index d134ae18da..49fa4933e9 100644
--- a/src/storage/virtstoraged.service.extra.in
+++ b/src/storage/virtstoraged.service.extra.in
@@ -1,3 +1,6 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
+
 [Unit]
 After=iscsid.service
 After=remote-fs.target
diff --git a/src/storage/virtstoraged.socket.extra.in b/src/storage/virtstoraged.socket.extra.in
new file mode 100644
index 0000000000..1fc8c672f7
--- /dev/null
+++ b/src/storage/virtstoraged.socket.extra.in
@@ -0,0 +1,2 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
diff --git a/src/vbox/meson.build b/src/vbox/meson.build
index e05f532e35..a162865356 100644
--- a/src/vbox/meson.build
+++ b/src/vbox/meson.build
@@ -61,6 +61,9 @@ if conf.has('WITH_VBOX')
     'service_extra_in': [
       files('virtvboxd.service.extra.in'),
     ],
+    'socket_extra_in': [
+      files('virtvboxd.socket.extra.in'),
+    ],
   }
 
   openrc_init_files += {
diff --git a/src/vbox/virtvboxd.service.extra.in b/src/vbox/virtvboxd.service.extra.in
index ba3ad13ace..5367f7516c 100644
--- a/src/vbox/virtvboxd.service.extra.in
+++ b/src/vbox/virtvboxd.service.extra.in
@@ -1,2 +1,5 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
+
 [Unit]
 After=remote-fs.target
diff --git a/src/vbox/virtvboxd.socket.extra.in b/src/vbox/virtvboxd.socket.extra.in
new file mode 100644
index 0000000000..1fc8c672f7
--- /dev/null
+++ b/src/vbox/virtvboxd.socket.extra.in
@@ -0,0 +1,2 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
diff --git a/src/vz/meson.build b/src/vz/meson.build
index bc5b5fb623..25d2b620d1 100644
--- a/src/vz/meson.build
+++ b/src/vz/meson.build
@@ -52,6 +52,9 @@ if conf.has('WITH_VZ')
     'service_extra_in': [
       files('virtvzd.service.extra.in'),
     ],
+    'socket_extra_in': [
+      files('virtvzd.socket.extra.in'),
+    ],
   }
 
   openrc_init_files += {
diff --git a/src/vz/virtvzd.service.extra.in b/src/vz/virtvzd.service.extra.in
index ba3ad13ace..5367f7516c 100644
--- a/src/vz/virtvzd.service.extra.in
+++ b/src/vz/virtvzd.service.extra.in
@@ -1,2 +1,5 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
+
 [Unit]
 After=remote-fs.target
diff --git a/src/vz/virtvzd.socket.extra.in b/src/vz/virtvzd.socket.extra.in
new file mode 100644
index 0000000000..1fc8c672f7
--- /dev/null
+++ b/src/vz/virtvzd.socket.extra.in
@@ -0,0 +1,2 @@
+# The contents of this unit will be merged into a base template.
+# Additional units might be merged as well. See meson.build for details.
-- 
2.41.0



More information about the libvir-list mailing list