From nobody Mon Feb 9 14:33:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695835642; cv=none; d=zohomail.com; s=zohoarc; b=EvmWYOwvw0pFLcrI9t0sL4TDc3YvZHkAk1SlvV0IrROFc138n1E88df7H8v0fhvjCO+ikBlnGLAc33sM0cwUWqZO0KtEHVdMCc8FE+sSeNDn4sqFr8q97gR11aoQkwM1CM6FAqP6JMhdbIR7Kang5E94K6r2Ic3bXtw9n8yBSu0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695835642; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hcIX1Pl+/p5abm9smkNXyN0/sAx7JL/EWza0XWNzhg0=; b=IlZFR79OQz9ZNwfP9ivfM9OMoDZ2Lo6Gkiss6ejsVZOwb92ewJ4WPIVzxV82aAKNxmX2CjvkJFpucGDxJsm7Fnt+cR4yn7shTHi5j08SbWvvu7mUWft3nAcMzqemvISQtC4tz05+HEwqdxXs+Q4gY+DPKVVG4n5iFOaLxUSzsLs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1695835642082869.3027282322346; Wed, 27 Sep 2023 10:27:22 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-488-TvTI76qDO163TVeNedtGjw-1; Wed, 27 Sep 2023 13:27:15 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 92C0F280FECC; Wed, 27 Sep 2023 17:27:12 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7C216C15BB8; Wed, 27 Sep 2023 17:27:12 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 68B8019465B7; Wed, 27 Sep 2023 17:26:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 917DE19466EC for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CCB6810EE402; Wed, 27 Sep 2023 16:19:38 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5FD151005E2A for ; Wed, 27 Sep 2023 16:19:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695835641; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=hcIX1Pl+/p5abm9smkNXyN0/sAx7JL/EWza0XWNzhg0=; b=clSEvTmqS4XWy9zsO9hmYDtcYiZOEPkCPbmjTc/LHq5t0Wgc4wreGnwnY0yBLS3FCxfqCI +CZp/wcQPqjP8yGaxS7PGRWYyCWsNSr/KwuHA3wIiJZnHZutEad2HgFSLCzh0H+eGB/Vpu Keue/HsdaVwY/8ubaHfUULk1BWvJOcE= X-MC-Unique: TvTI76qDO163TVeNedtGjw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 03/33] systemd: Make @service_in@ optional Date: Wed, 27 Sep 2023 18:19:04 +0200 Message-ID: <20230927161934.181728-4-abologna@redhat.com> In-Reply-To: <20230927161934.181728-1-abologna@redhat.com> References: <20230927161934.181728-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695835642449100001 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 Reviewed-by: Daniel P. Berrang=C3=A9 --- src/meson.build | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 =3D [] # 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 =3D [] @@ -803,6 +803,8 @@ if conf.has('WITH_LIBVIRTD') sockmode =3D '0600' endif =20 + service_in_default =3D 'remote' / 'libvirtd.service.in' + foreach unit : virt_daemon_units unit_conf =3D configuration_data({ 'runstatedir': runstatedir, @@ -816,7 +818,7 @@ if conf.has('WITH_LIBVIRTD') 'sockmode': sockmode, }) =20 - service_in =3D unit['service_in'] + service_in =3D unit.get('service_in', service_in_default) service_out =3D '@0@.service'.format(unit['service']) =20 configure_file( --=20 2.41.0