systemd: Provide all input files explicitly

We're about to change the defaults and start migrating to common
templates: in order to be able to switch units over one at a
time, make the input files that are currently used explicit
rather than implicit.

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

src/ch/meson.build

@@ -59,6 +59,9 @@ if conf.has('WITH_CH')
     'service': 'virtchd',
     'service_in': files('virtchd.service.in'),
     'name': 'Libvirt ch',
+    'socket_in': libvirtd_socket_in,
+    'socket_ro_in': libvirtd_socket_ro_in,
+    'socket_admin_in': libvirtd_socket_admin_in,
   }
 
   virt_install_dirs += [

src/interface/meson.build

@@ -46,6 +46,9 @@ if conf.has('WITH_INTERFACE')
     'service': 'virtinterfaced',
     'service_in': files('virtinterfaced.service.in'),
     'name': 'Libvirt interface',
+    'socket_in': libvirtd_socket_in,
+    'socket_ro_in': libvirtd_socket_ro_in,
+    'socket_admin_in': libvirtd_socket_admin_in,
   }
 
   openrc_init_files += {

src/libxl/meson.build

@@ -68,6 +68,9 @@ if conf.has('WITH_LIBXL')
     'service': 'virtxend',
     'service_in': files('virtxend.service.in'),
     'name': 'Libvirt libxl',
+    'socket_in': libvirtd_socket_in,
+    'socket_ro_in': libvirtd_socket_ro_in,
+    'socket_admin_in': libvirtd_socket_admin_in,
     'deps': 'ConditionPathExists=/proc/xen/capabilities',
   }
 

src/lxc/meson.build

@@ -166,6 +166,9 @@ if conf.has('WITH_LXC')
     'service': 'virtlxcd',
     'service_in': files('virtlxcd.service.in'),
     'name': 'Libvirt lxc',
+    'socket_in': libvirtd_socket_in,
+    'socket_ro_in': libvirtd_socket_ro_in,
+    'socket_admin_in': libvirtd_socket_admin_in,
   }
 
   openrc_init_files += {

src/network/meson.build

@@ -64,6 +64,9 @@ if conf.has('WITH_NETWORK')
     'service': 'virtnetworkd',
     'service_in': files('virtnetworkd.service.in'),
     'name': 'Libvirt network',
+    'socket_in': libvirtd_socket_in,
+    'socket_ro_in': libvirtd_socket_ro_in,
+    'socket_admin_in': libvirtd_socket_admin_in,
   }
 
   openrc_init_files += {

src/node_device/meson.build

@@ -54,6 +54,9 @@ if conf.has('WITH_NODE_DEVICES')
     'service': 'virtnodedevd',
     'service_in': files('virtnodedevd.service.in'),
     'name': 'Libvirt nodedev',
+    'socket_in': libvirtd_socket_in,
+    'socket_ro_in': libvirtd_socket_ro_in,
+    'socket_admin_in': libvirtd_socket_admin_in,
   }
 
   openrc_init_files += {

src/nwfilter/meson.build

@@ -52,6 +52,9 @@ if conf.has('WITH_NWFILTER')
     'service': 'virtnwfilterd',
     'service_in': files('virtnwfilterd.service.in'),
     'name': 'Libvirt nwfilter',
+    'socket_in': libvirtd_socket_in,
+    'socket_ro_in': libvirtd_socket_ro_in,
+    'socket_admin_in': libvirtd_socket_admin_in,
   }
 
   openrc_init_files += {

src/qemu/meson.build

@@ -185,6 +185,9 @@ if conf.has('WITH_QEMU')
     'service': 'virtqemud',
     'service_in': files('virtqemud.service.in'),
     'name': 'Libvirt qemu',
+    'socket_in': libvirtd_socket_in,
+    'socket_ro_in': libvirtd_socket_ro_in,
+    'socket_admin_in': libvirtd_socket_admin_in,
   }
 
   openrc_init_files += {

src/remote/meson.build

@@ -194,6 +194,11 @@ if conf.has('WITH_REMOTE')
       'name': 'Libvirt',
       'sockprefix': 'libvirt',
       'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ],
+      'socket_in': files('libvirtd.socket.in'),
+      'socket_ro_in': files('libvirtd-ro.socket.in'),
+      'socket_admin_in': files('libvirtd-admin.socket.in'),
+      'socket_tcp_in': files('libvirtd-tcp.socket.in'),
+      'socket_tls_in': files('libvirtd-tls.socket.in'),
     }
 
     openrc_init_files += {
@@ -223,6 +228,11 @@ if conf.has('WITH_REMOTE')
       'name': 'Libvirt proxy',
       'sockprefix': 'libvirt',
       'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ],
+      'socket_in': files('libvirtd.socket.in'),
+      'socket_ro_in': files('libvirtd-ro.socket.in'),
+      'socket_admin_in': files('libvirtd-admin.socket.in'),
+      'socket_tcp_in': files('libvirtd-tcp.socket.in'),
+      'socket_tls_in': files('libvirtd-tls.socket.in'),
     }
 
     openrc_init_files += {

src/secret/meson.build

@@ -35,6 +35,9 @@ if conf.has('WITH_SECRETS')
     'service': 'virtsecretd',
     'service_in': files('virtsecretd.service.in'),
     'name': 'Libvirt secret',
+    'socket_in': libvirtd_socket_in,
+    'socket_ro_in': libvirtd_socket_ro_in,
+    'socket_admin_in': libvirtd_socket_admin_in,
   }
 
   openrc_init_files += {

src/storage/meson.build

@@ -113,6 +113,9 @@ if conf.has('WITH_STORAGE')
     'service': 'virtstoraged',
     'service_in': files('virtstoraged.service.in'),
     'name': 'Libvirt storage',
+    'socket_in': libvirtd_socket_in,
+    'socket_ro_in': libvirtd_socket_ro_in,
+    'socket_admin_in': libvirtd_socket_admin_in,
   }
 
   openrc_init_files += {

src/vbox/meson.build

@@ -59,6 +59,9 @@ if conf.has('WITH_VBOX')
     'service': 'virtvboxd',
     'service_in': files('virtvboxd.service.in'),
     'name': 'Libvirt vbox',
+    'socket_in': libvirtd_socket_in,
+    'socket_ro_in': libvirtd_socket_ro_in,
+    'socket_admin_in': libvirtd_socket_admin_in,
   }
 
   openrc_init_files += {

src/vz/meson.build

@@ -50,6 +50,9 @@ if conf.has('WITH_VZ')
     'service': 'virtvzd',
     'service_in': files('virtvzd.service.in'),
     'name': 'Libvirt vz',
+    'socket_in': libvirtd_socket_in,
+    'socket_ro_in': libvirtd_socket_ro_in,
+    'socket_admin_in': libvirtd_socket_admin_in,
   }
 
   openrc_init_files += {