[libvirt PATCH 12/42] systemd: Make @service_in@ optional

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



It is currently considered required, but we're soon going to
provide a default that will be suitable for most services.

Since all services currently provide a value explicitly, we
can implement a default without breaking anything.

Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx>
---
 src/meson.build | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/meson.build b/src/meson.build
index 6c85cc9b9b..b1dd9e5422 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -194,10 +194,10 @@ guest_unit_files = []
 # virt_daemon_units:
 #   generate libvirt daemon systemd unit files
 #   * service - name of the service (required)
-#   * service_in - service source file (required)
 #   * name - socket description (required)
 #   * sockprefix - socket prefix name (optional, default unit['service'])
 #   * sockets - array of additional sockets (optional, default [ 'main', 'ro', 'admin' ])
+#   * service_in - service source file (optional, default remote/libvirtd.service.in)
 #   * socket_$name_in - additional socket source files (optional, default remote/libvirtd.socket.in )
 #   * deps - socket dependencies (optional, default '')
 virt_daemon_units = []
@@ -803,6 +803,8 @@ if conf.has('WITH_LIBVIRTD')
       sockmode = '0600'
     endif
 
+    service_in_default = 'remote' / 'libvirtd.service.in'
+
     foreach unit : virt_daemon_units
       unit_conf = configuration_data({
         'runstatedir': runstatedir,
@@ -817,7 +819,7 @@ if conf.has('WITH_LIBVIRTD')
       })
 
       configure_file(
-        input: unit['service_in'],
+        input: unit.get('service_in', service_in_default),
         output: '@0@.service'.format(unit['service']),
         configuration: unit_conf,
         install: true,
-- 
2.41.0




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux