systemd: Accept multiple files for service_extra_in/socket_extra_in

Now that the underlying script is able to merge an arbitrary
number of units into the base template, expose this possibility
in the build system.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/ch/meson.build b/src/ch/meson.build
index 6311b84f3e28160d9550b7f666f4c8f1961a3221..1d612a7369f4739e662fc2527e58951f48b08af3 100644 (file)
--- a/src/ch/meson.build
+++ b/src/ch/meson.build
@@ -60,7 +60,9 @@ if conf.has('WITH_CH')
   virt_daemon_units += {
     'service': 'virtchd',
     'name': 'Cloud Hypervisor',
-    'service_extra_in': files('virtchd.service.extra.in'),
+    'service_extra_in': [
+      files('virtchd.service.extra.in'),
+    ],
   }
 
   virt_install_dirs += [

diff --git a/src/libxl/meson.build b/src/libxl/meson.build
index 8e6f45513914e0c0fe6677921bbb7a6272f5075b..e75a8f2fdbe8c3390143d6b845e992b007d3c84a 100644 (file)
--- a/src/libxl/meson.build
+++ b/src/libxl/meson.build
@@ -67,8 +67,12 @@ if conf.has('WITH_LIBXL')
   virt_daemon_units += {
     'service': 'virtxend',
     'name': 'Xen',
-    'service_extra_in': files('virtxend.service.extra.in'),
-    'socket_extra_in': files('virtxend.socket.extra.in'),
+    'service_extra_in': [
+      files('virtxend.service.extra.in'),
+    ],
+    'socket_extra_in': [
+      files('virtxend.socket.extra.in'),
+    ],
   }
 
   openrc_init_files += {

diff --git a/src/lxc/meson.build b/src/lxc/meson.build
index 5eb23fbbbf1a7d2e25bf60b2677d42bed9490227..198e282e635089b168c4c5d0882ae1de30e0ac3f 100644 (file)
--- a/src/lxc/meson.build
+++ b/src/lxc/meson.build
@@ -165,7 +165,9 @@ if conf.has('WITH_LXC')
   virt_daemon_units += {
     'service': 'virtlxcd',
     'name': 'LXC',
-    'service_extra_in': files('virtlxcd.service.extra.in'),
+    'service_extra_in': [
+      files('virtlxcd.service.extra.in'),
+    ],
   }
 
   openrc_init_files += {

diff --git a/src/meson.build b/src/meson.build
index 144f24e526925a04fcc50993d03ec9130f736444..f3814d75ce2435f8c99c26e50e37b79b8b7f7a49 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -199,8 +199,8 @@ guest_unit_files = []
 #   * sockets - array of additional sockets (optional, default [ 'main', 'ro', 'admin' ])
 #   * service_in - service source file (optional, default virtd.service.in)
 #   * socket_$name_in - additional socket source files (optional, default virtd.socket.in or virtd-$name.socket.in)
-#   * service_extra_in - unit to merge with service_in (optional, default None)
-#   * socket_extra_in - unit to merge with socket_$name_in (optional, default None)
+#   * service_extra_in - units to merge with service_in (optional, default [])
+#   * socket_extra_in - units to merge with socket_$name_in (optional, default [])
 virt_daemon_units = []
 
 # openrc_init_files
@@ -824,9 +824,9 @@ if conf.has('WITH_LIBVIRTD')
 
       if 'service_extra_in' in unit
         service_in = configure_file(
-          input: [ service_in, unit['service_extra_in'] ],
+          input: [ service_in ] + unit['service_extra_in'],
           output: '@0@.in'.format(service_out),
-          command: [ merge_systemd_units_prog, '@INPUT0@', '@INPUT1@' ],
+          command: [ merge_systemd_units_prog, '@INPUT@' ],
           capture: true,
         )
       endif
@@ -852,9 +852,9 @@ if conf.has('WITH_LIBVIRTD')
 
         if 'socket_extra_in' in unit
           socket_in = configure_file(
-            input: [ socket_in, unit['socket_extra_in'] ],
+            input: [ socket_in ] + unit['socket_extra_in'],
             output: '@0@.in'.format(socket_out),
-            command: [ merge_systemd_units_prog, '@INPUT0@', '@INPUT1@' ],
+            command: [ merge_systemd_units_prog, '@INPUT@' ],
             capture: true,
           )
         endif

diff --git a/src/network/meson.build b/src/network/meson.build
index d0383cca1c1a01a9be117d1f666d83f45d2e8fe5..3cf2ef3d3d779bcac0a0a5636f753d16166ab7b6 100644 (file)
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -63,7 +63,9 @@ if conf.has('WITH_NETWORK')
   virt_daemon_units += {
     'service': 'virtnetworkd',
     'name': 'network',
-    'service_extra_in': files('virtnetworkd.service.extra.in'),
+    'service_extra_in': [
+      files('virtnetworkd.service.extra.in'),
+    ],
   }
 
   openrc_init_files += {

diff --git a/src/qemu/meson.build b/src/qemu/meson.build
index 64c62e584f22c4a888ea8f811fdabb914801252b..fff61ddf27513d71ec1d2c84f0149e7088e2e504 100644 (file)
--- a/src/qemu/meson.build
+++ b/src/qemu/meson.build
@@ -184,7 +184,9 @@ if conf.has('WITH_QEMU')
   virt_daemon_units += {
     'service': 'virtqemud',
     'name': 'QEMU',
-    'service_extra_in': files('virtqemud.service.extra.in'),
+    'service_extra_in': [
+      files('virtqemud.service.extra.in'),
+    ],
   }
 
   openrc_init_files += {

diff --git a/src/storage/meson.build b/src/storage/meson.build
index 023353c1d6035ee81b63327bc351eee4e1977573..daad8abf250399b01b3307225c9158bd741fb331 100644 (file)
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -112,7 +112,9 @@ if conf.has('WITH_STORAGE')
   virt_daemon_units += {
     'service': 'virtstoraged',
     'name': 'storage',
-    'service_extra_in': files('virtstoraged.service.extra.in'),
+    'service_extra_in': [
+      files('virtstoraged.service.extra.in'),
+    ],
   }
 
   openrc_init_files += {

diff --git a/src/vbox/meson.build b/src/vbox/meson.build
index a72c1833f1ad8cfaba3b57fbb2fb09d19ffa43af..e05f532e35327105375460e23c704edf3dd67d2c 100644 (file)
--- a/src/vbox/meson.build
+++ b/src/vbox/meson.build
@@ -58,7 +58,9 @@ if conf.has('WITH_VBOX')
   virt_daemon_units += {
     'service': 'virtvboxd',
     'name': 'VirtualBox',
-    'service_extra_in': files('virtvboxd.service.extra.in'),
+    'service_extra_in': [
+      files('virtvboxd.service.extra.in'),
+    ],
   }
 
   openrc_init_files += {

diff --git a/src/vz/meson.build b/src/vz/meson.build
index ce2cbae454cc85fd3b13ebbb684c49dabafb9d04..bc5b5fb623c69e31f73c3622ac9e5f09607f28df 100644 (file)
--- a/src/vz/meson.build
+++ b/src/vz/meson.build
@@ -49,7 +49,9 @@ if conf.has('WITH_VZ')
   virt_daemon_units += {
     'service': 'virtvzd',
     'name': 'vz',
-    'service_extra_in': files('virtvzd.service.extra.in'),
+    'service_extra_in': [
+      files('virtvzd.service.extra.in'),
+    ],
   }
 
   openrc_init_files += {