From nobody Mon Feb 9 17:05:07 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=1695668387; cv=none; d=zohomail.com; s=zohoarc; b=P6Bsp2y7Uy7fZB1YPb8u84AyL+aQ4ANXj5mdiKxJJz2pGpjbO6QRpwsZXEZZ6JtSQvPwmxqQ499w/1hcJH5SLvcoGwK47khQSQBkrXdVcJzZwozAd7XR6m4rOqauJrc8Y4RFe+omhUMzgu8XkoRCDxQPFB9DKQ4SqDI5/K3nTXg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668387; 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=PpvNstLS+dOhKUlbwf/rIvJPcVm01hOdcKXt50v8wwg=; b=QCyecc+3rjRm901E2G7+xXYtYgm5TBoSPKdi2fXzofQ+VnEcK7bwcFpLhhzto7CPGLfburWlcgby+ivTw7wUhj8FnKbs1t8iv8OcLASxNQ3bfNV6gpqZ9PhDi4WhZZCC7SXwi2k38KX+knphAbCbN+08F195ecXtLmAA4CxaRD4= 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 1695668387231230.32338375026814; Mon, 25 Sep 2023 11:59:47 -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-602-kF05ql3JNmm_dopciOhlig-1; Mon, 25 Sep 2023 14:59:41 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 AC6083C1E9E7; Mon, 25 Sep 2023 18:59:34 +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 97D282156701; Mon, 25 Sep 2023 18:59:34 +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 DDA211946A69; Mon, 25 Sep 2023 18:59:26 +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 3FE6E1946A41 for ; Mon, 25 Sep 2023 18:59:25 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 20D4C711293; Mon, 25 Sep 2023 18:59:25 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A86A7711286 for ; Mon, 25 Sep 2023 18:59:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668386; 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=PpvNstLS+dOhKUlbwf/rIvJPcVm01hOdcKXt50v8wwg=; b=g90a9+nxIjCFV7V1NjIU7caWUoGLRJ+Q6WcnLdxCegwccMPobGdGDDsaMP76zrhub9zpkI IT5Pwmx3e5z7hkYwvWgiPnIDHJuUV/9BQPkc2eqfUMoJTmi3qoVQxkql+UuSRScsRr3lN4 0wT7bq48BZLXu4tJqJoV0IcIoRnKeSE= X-MC-Unique: kF05ql3JNmm_dopciOhlig-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 23/42] systemd: Switch virtproxyd to common templates Date: Mon, 25 Sep 2023 20:58:21 +0200 Message-ID: <20230925185840.880191-24-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.6 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: 1695668388343100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani --- src/remote/meson.build | 10 +++------- src/remote/virtproxyd.service.in | 25 ------------------------- 2 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 src/remote/virtproxyd.service.in diff --git a/src/remote/meson.build b/src/remote/meson.build index 365d632095..73a9f0a986 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -226,16 +226,12 @@ if conf.has('WITH_REMOTE') =20 virt_daemon_units +=3D { 'service': 'virtproxyd', - 'service_in': files('virtproxyd.service.in'), 'name': 'Libvirt proxy', 'sockprefix': 'libvirt', 'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ], - 'socket_in': files('libvirtd.socket.in'), - 'socket_ro_in': files('libvirtd-ro.socket.in'), - 'socket_admin_in': files('libvirtd-admin.socket.in'), - 'socket_tcp_in': files('libvirtd-tcp.socket.in'), - 'socket_tls_in': files('libvirtd-tls.socket.in'), - 'deps': 'Conflicts=3D' + libvirtd_socket_conflicts, + 'socket_unit_extra': [ + 'Conflicts=3D' + libvirtd_socket_conflicts, + ], } =20 openrc_init_files +=3D { diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.servi= ce.in deleted file mode 100644 index 9b829641f7..0000000000 --- a/src/remote/virtproxyd.service.in +++ /dev/null @@ -1,25 +0,0 @@ -[Unit] -Description=3DVirtualization daemon -Conflicts=3Dlibvirtd.service -Requires=3Dvirtproxyd.socket -Requires=3Dvirtproxyd-ro.socket -Requires=3Dvirtproxyd-admin.socket -After=3Dnetwork.target -After=3Ddbus.service -After=3Dapparmor.service -Documentation=3Dman:virtproxyd(8) -Documentation=3Dhttps://libvirt.org - -[Service] -Type=3Dnotify -Environment=3DVIRTPROXYD_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@initconfdir@/virtproxyd -ExecStart=3D@sbindir@/virtproxyd $VIRTPROXYD_ARGS -ExecReload=3D/bin/kill -HUP $MAINPID -Restart=3Don-failure - -[Install] -WantedBy=3Dmulti-user.target -Also=3Dvirtproxyd.socket -Also=3Dvirtproxyd-ro.socket -Also=3Dvirtproxyd-admin.socket --=20 2.41.0