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@xxxxxxxxxx>
---
src/ch/meson.build | 3 +++
src/interface/meson.build | 3 +++
src/libxl/meson.build | 3 +++
src/lxc/meson.build | 3 +++
src/network/meson.build | 3 +++
src/node_device/meson.build | 3 +++
src/nwfilter/meson.build | 3 +++
src/qemu/meson.build | 3 +++
src/remote/meson.build | 10 ++++++++++
src/secret/meson.build | 3 +++
src/storage/meson.build | 3 +++
src/vbox/meson.build | 3 +++
src/vz/meson.build | 3 +++
13 files changed, 46 insertions(+)
diff --git a/src/ch/meson.build b/src/ch/meson.build
index 936b9bc95a..dc08069dcd 100644
--- 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 06c5241fa3..6fa65117c3 100644
--- 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 db8ccde38e..a1553dbe27 100644
--- 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 a8773f64a5..531078448c 100644
--- 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 40abfaef7e..2e51d5d47b 100644
--- 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 47d9f63600..dd60b1f819 100644
--- 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 5efdee7189..de672bb827 100644
--- 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 afa9139d9a..b52497bdf0 100644
--- 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 dc2f528d0b..78c08bf5ad 100644
--- 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 49f6972f36..58e47c22e8 100644
--- 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 d0d0b72228..e0a1e9f4de 100644
--- 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 9f2fb0f938..2d6b71ab8f 100644
--- 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 4c8747e3eb..9c2eb90463 100644
--- 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 += {
--
2.41.0
