From nobody Mon Feb 9 17:05:02 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=1695668470; cv=none; d=zohomail.com; s=zohoarc; b=MGMOcbbCxX9IGo6hiTm6cz4K98A9gqGnD+EVGoIPUUGjstXnAInwI9m2fskB0dB0C3Yqq8+4sck8xHl+8DFqD7LMd/D30BtbW7y5IXzfbvyzllVRDFauHI9zSJWMPgXM6VCMF2waBOKOeF4di7DIBqamcYhpZ8duo07nrmZ4Z+E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668470; 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=JR+O9/kBlBZpZ2cFG/JjV3a5/RBw1lLNyxBc/Cv+QFU=; b=JzHhkp0BCdJPeujTSKtF/pNo7aLbKT0GoRyXvhkFvB6rbXGuFnfgrYzgrHkwMGVpXhTY0AKesiXJQTAUaK0QCXJe/Jssboofj47jwtcemeScdCVIowAVX82oWkELyfZyTdwlj0BJjHtPJdOIccEQ6zmymcDo75E+BVPEoitEsHE= 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 169566847063447.61072904366483; Mon, 25 Sep 2023 12:01:10 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-577-yEqv0d3pPXi-vgRiCBGcnA-1; Mon, 25 Sep 2023 14:59:53 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 E0BD3811E7D; Mon, 25 Sep 2023 18:59:46 +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 C93FD140273E; Mon, 25 Sep 2023 18:59:46 +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 B30BA19465B9; Mon, 25 Sep 2023 18:59:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2B99F19466E8 for ; Mon, 25 Sep 2023 18:59:15 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0E6E4711293; Mon, 25 Sep 2023 18:59:15 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 95DF6711286 for ; Mon, 25 Sep 2023 18:59:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668469; 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=JR+O9/kBlBZpZ2cFG/JjV3a5/RBw1lLNyxBc/Cv+QFU=; b=hrdRmqK1zG5d//MAL5FLP7OwSXWN1smyksI64jkQll6VBkYOC7I+Uq3f5VYYociuW4Fyek lg8faIBGWJD7lbIhoNSSuHKZpRLXLkTY5Crs3FNgNVLVYWImhFIhsiH4be7XCoDqMjpT0h mnSPQQ8jtYvJtpZjIpACu1qeOlZg9cs= X-MC-Unique: yEqv0d3pPXi-vgRiCBGcnA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 16/42] systemd: Use common templates by default Date: Mon, 25 Sep 2023 20:58:14 +0200 Message-ID: <20230925185840.880191-17-abologna@redhat.com> In-Reply-To: <20230925185840.880191-1-abologna@redhat.com> References: <20230925185840.880191-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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.7 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: 1695668471248100001 Content-Type: text/plain; charset="utf-8"; x-default="true" All services are still listing their input files explicitly, so no changes to the output files will occur yet. Signed-off-by: Andrea Bolognani --- src/meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/meson.build b/src/meson.build index d7133d1293..b00895fd07 100644 --- a/src/meson.build +++ b/src/meson.build @@ -201,8 +201,8 @@ libvirtd_socket_admin_in =3D files('remote' / 'libvirtd= -admin.socket.in') # * 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 ) +# * 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_$name_extra - additional lines for service's [$name] section= (optional, default []) # * socket_$name_extra - additional lines for socket's [$name] section (= optional, default []) # * deps - socket dependencies (optional, default '') @@ -809,7 +809,7 @@ if conf.has('WITH_LIBVIRTD') sockmode =3D '0600' endif =20 - service_in_default =3D 'remote' / 'libvirtd.service.in' + service_in_default =3D 'virtd.service.in' =20 foreach unit : virt_daemon_units unit_conf =3D configuration_data({ @@ -842,11 +842,11 @@ if conf.has('WITH_LIBVIRTD') =20 foreach socket : unit.get('sockets', [ 'main', 'ro', 'admin' ]) if socket =3D=3D 'main' - socket_in_default =3D 'remote' / 'libvirtd.socket.in' + socket_in_default =3D 'virtd.socket.in' socket_in =3D unit.get('socket_in', socket_in_default) socket_out =3D '@0@.socket'.format(unit['service']) else - socket_in_default =3D 'remote' / 'libvirtd-@0@.socket.in'.format= (socket) + socket_in_default =3D 'virtd-@0@.socket.in'.format(socket) socket_in =3D unit.get('socket_@0@_in'.format(socket), socket_in= _default) socket_out =3D '@0@-@1@.socket'.format(unit['service'], socket) endif --=20 2.41.0