systemd: Set service_extra_in/socket_extra_in everywhere

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@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

src/ch/meson.build

@@ -66,6 +66,9 @@ if conf.has('WITH_CH')
       systemd_service_tasksmax_extra_in,
       systemd_service_limitmemlock_extra_in,
     ],
+    'socket_extra_in': [
+      files('virtchd.socket.extra.in'),
+    ],
   }
 
   virt_install_dirs += [

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

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.

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 += {

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.

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.

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

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

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 += {

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.

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.

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 += {

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.

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.

src/lxc/meson.build

@@ -171,6 +171,9 @@ if conf.has('WITH_LXC')
       systemd_service_tasksmax_extra_in,
       systemd_service_limitmemlock_extra_in,
     ],
+    'socket_extra_in': [
+      files('virtlxcd.socket.extra.in'),
+    ],
   }
 
   openrc_init_files += {

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

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.

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 += {

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

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.

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 += {

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.

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.

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 += {

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.

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.

src/qemu/meson.build

@@ -190,6 +190,9 @@ if conf.has('WITH_QEMU')
       systemd_service_tasksmax_extra_in,
       systemd_service_limitmemlock_extra_in,
     ],
+    'socket_extra_in': [
+      files('virtqemud.socket.extra.in'),
+    ],
   }
 
   openrc_init_files += {

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

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.

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.

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.

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_tasksmax_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 += {

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.

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.

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 += {

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.

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.

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 += {

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

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.

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 += {

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

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.

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 += {

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

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.