From: Andrea Bolognani <abologna@redhat.com>
Date: Thu, 21 Sep 2023 15:08:28 +0000 (+0200)
Subject: systemd: Make @service_in@ optional
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=cbe04f1a562ae3034a140b6f810560e21fffe547;p=libvirt.git

systemd: Make @service_in@ optional

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@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/meson.build b/src/meson.build
index c6728cc8f8..b7c2076c04 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,
@@ -816,7 +818,7 @@ if conf.has('WITH_LIBVIRTD')
         'sockmode': sockmode,
       })
 
-      service_in = unit['service_in']
+      service_in = unit.get('service_in', service_in_default)
       service_out = '@0@.service'.format(unit['service'])
 
       configure_file(