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>

diff --git a/src/ch/meson.build b/src/ch/meson.build
index 936b9bc95a8ea33c1dfe6cca9eeeac62c0cbc7f8..dc08069dcd6ddbba94a0e6bbbb87473e1ffc22dd 100644 (file)
--- a/src/ch/meson.build
+++ b/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 += [

diff --git a/src/interface/meson.build b/src/interface/meson.build
index 06c5241fa380aa24e99a24244e7bcceb9876bbf6..6fa65117c392f57dcc892c2bf9f0415a86f64a21 100644 (file)
--- a/src/interface/meson.build
+++ b/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 += {

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

diff --git a/src/lxc/meson.build b/src/lxc/meson.build
index a8773f64a58abfc3e14d5859d8db083f69a737a2..531078448c2a5bb1a1776e03f17fe78a4b4fb288 100644 (file)
--- a/src/lxc/meson.build
+++ b/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 += {

diff --git a/src/network/meson.build b/src/network/meson.build
index 40abfaef7ead1446f9a3fc77299f1bfdea3561b2..2e51d5d47b24fd0761f22758a510e715650c0c58 100644 (file)
--- a/src/network/meson.build
+++ b/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 += {

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

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

diff --git a/src/qemu/meson.build b/src/qemu/meson.build
index afa9139d9a593257c69eb62983a53063ba497824..b52497bdf014c60d202ba3a639df28332347a404 100644 (file)
--- a/src/qemu/meson.build
+++ b/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 += {

diff --git a/src/remote/meson.build b/src/remote/meson.build
index dc2f528d0bd71d9ae0e2b93a5978f1dbf4147d05..78c08bf5add74d608c38fba3e2dc386572026658 100644 (file)
--- a/src/remote/meson.build
+++ b/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 += {

diff --git a/src/secret/meson.build b/src/secret/meson.build
index 49f6972f368f495c047c81a29ce7bcfbabf8ca3c..58e47c22e8f6bb6afe44d0609996db72a134409b 100644 (file)
--- a/src/secret/meson.build
+++ b/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 += {

diff --git a/src/storage/meson.build b/src/storage/meson.build
index d0d0b722284f49fb3d116f882d492b523f83834b..e0a1e9f4de18ce0d316550becae6b12c635d8072 100644 (file)
--- a/src/storage/meson.build
+++ b/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 += {

diff --git a/src/vbox/meson.build b/src/vbox/meson.build
index 9f2fb0f938fbf70b76194b962d9bffe003c846f7..2d6b71ab8ffd5dbfff60297e9d0e460041442834 100644 (file)
--- a/src/vbox/meson.build
+++ b/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 += {

diff --git a/src/vz/meson.build b/src/vz/meson.build
index 4c8747e3eb11358a69cde160e32a1b7c5806934a..9c2eb904632fc805ff861624c4b7375e34ce845d 100644 (file)
--- a/src/vz/meson.build
+++ b/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 += {