From nobody Sun Feb 8 10:48:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1565277253; cv=none; d=zoho.com; s=zohoarc; b=XnEdKpyw0btfkZ5I+vYV9N/ea9xllK90HheQl43D3w0yvf+N8E6sBRS03yFDt4YB6DLfIGlqpCo9o+9lXcuECEt41Bdmme5ttCm2VvkE7MgYyk0BU6ZCRcgrFKRzIrV8asTYx2w8r/oQBdZS0h/zF8S5pOgPOhcsuwHP80hM4Ng= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565277253; h=Content-Type:Content-Transfer-Encoding:Cc: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:ARC-Authentication-Results; bh=/OvtKub3h88A8xRHi6qjfvfAmWnQyVZofHPqIM5rnSo=; b=MFzvWk0XJoNI+evWKJ/0gvfxjK577bekZPOrmR10+NnpvyAKxa5xgmvDYtkcajSG7VXPmU6kUbZFAOx/f9qw2cK1AimPnaYy7dQQzRfX+Gj97PCf80XY27K54bf3Vk1845ZTtZ3qtAp7+QVJ1YBB3NI8LGXs1ILwNMeb9l7LElQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1565277253807871.9935605167229; Thu, 8 Aug 2019 08:14:13 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 99AC2309C0F5; Thu, 8 Aug 2019 15:14:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 61881601B7; Thu, 8 Aug 2019 15:14:12 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 193C41803B4C; Thu, 8 Aug 2019 15:14:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x78FBTKx027474 for ; Thu, 8 Aug 2019 11:11:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id D17071001948; Thu, 8 Aug 2019 15:11:29 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com [10.36.112.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9E4C610016F3; Thu, 8 Aug 2019 15:11:28 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 8 Aug 2019 16:10:19 +0100 Message-Id: <20190808151044.11385-18-berrange@redhat.com> In-Reply-To: <20190808151044.11385-1-berrange@redhat.com> References: <20190808151044.11385-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: Christophe de Dinechin , Andrea Bolognani Subject: [libvirt] [PATCH v4 17/42] remote: conditionalize systemd socket unit files X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Thu, 08 Aug 2019 15:14:13 +0000 (UTC) Prepare for reusing libvirtd socket unit files with other daemons by making various parts of their config conditionally defined by the make rules. Reviewed-by: Christophe de Dinechin Reviewed-by: Andrea Bolognani Signed-off-by: Daniel P. Berrang=C3=A9 --- src/remote/Makefile.inc.am | 4 ++++ src/remote/libvirtd-admin.socket.in | 15 ++++++++------- src/remote/libvirtd-ro.socket.in | 15 ++++++++------- src/remote/libvirtd-tcp.socket.in | 13 +++++++------ src/remote/libvirtd-tls.socket.in | 13 +++++++------ src/remote/libvirtd.socket.in | 11 ++++++----- 6 files changed, 40 insertions(+), 31 deletions(-) diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 554fa4afe9..6d29458a77 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -295,6 +295,10 @@ endif WITH_SASL =20 LIBVIRTD_UNIT_VARS =3D \ $(COMMON_UNIT_VARS) \ + -e 's|[@]name[@]|Libvirt|g' \ + -e 's|[@]service[@]|libvirtd|g' \ + -e 's|[@]sockprefix[@]|libvirt|g' \ + -e 's|[@]deps[@]||g' \ $(NULL) =20 libvirtd.service: remote/libvirtd.service.in $(top_builddir)/config.status diff --git a/src/remote/libvirtd-admin.socket.in b/src/remote/libvirtd-admi= n.socket.in index bbab4ea355..dcce7fdc93 100644 --- a/src/remote/libvirtd-admin.socket.in +++ b/src/remote/libvirtd-admin.socket.in @@ -1,14 +1,15 @@ [Unit] -Description=3DLibvirt admin socket -Before=3Dlibvirtd.service -BindsTo=3Dlibvirtd.socket -After=3Dlibvirtd.socket +Description=3D@name@ admin socket +Before=3D@service@.service +BindsTo=3D@service@.socket +After=3D@service@.socket +@deps@ =20 [Socket] -# The directory must match the @sysconfdir@/libvirt/libvirtd.conf unix_soc= k_dir setting +# The directory must match the @sysconfdir@/libvirt/@service@.conf unix_so= ck_dir setting # when using systemd version < 227 -ListenStream=3D@localstatedir@/run/libvirt/libvirt-admin-sock -Service=3Dlibvirtd.service +ListenStream=3D@localstatedir@/run/libvirt/@sockprefix@-admin-sock +Service=3D@service@.service SocketMode=3D0600 =20 [Install] diff --git a/src/remote/libvirtd-ro.socket.in b/src/remote/libvirtd-ro.sock= et.in index 5f8b1892d5..a287f78201 100644 --- a/src/remote/libvirtd-ro.socket.in +++ b/src/remote/libvirtd-ro.socket.in @@ -1,14 +1,15 @@ [Unit] -Description=3DLibvirt local read-only socket -Before=3Dlibvirtd.service -BindsTo=3Dlibvirtd.socket -After=3Dlibvirtd.socket +Description=3D@name@ local read-only socket +Before=3D@service@.service +BindsTo=3D@service@.socket +After=3D@service@.socket +@deps@ =20 [Socket] -# The directory must match the @sysconfdir@/libvirt/libvirtd.conf unix_soc= k_dir setting +# The directory must match the @sysconfdir@/libvirt/@service@.conf unix_so= ck_dir setting # when using systemd version < 227 -ListenStream=3D@localstatedir@/run/libvirt/libvirt-sock-ro -Service=3Dlibvirtd.service +ListenStream=3D@localstatedir@/run/libvirt/@sockprefix@-sock-ro +Service=3D@service@.service SocketMode=3D0666 =20 [Install] diff --git a/src/remote/libvirtd-tcp.socket.in b/src/remote/libvirtd-tcp.so= cket.in index 1103036c45..dd60317d47 100644 --- a/src/remote/libvirtd-tcp.socket.in +++ b/src/remote/libvirtd-tcp.socket.in @@ -1,14 +1,15 @@ [Unit] -Description=3DLibvirt non-TLS IP socket -Before=3Dlibvirtd.service -BindsTo=3Dlibvirtd.socket -After=3Dlibvirtd.socket +Description=3D@name@ non-TLS IP socket +Before=3D@service@.service +BindsTo=3D@service@.socket +After=3D@service@.socket +@deps@ =20 [Socket] -# This must match the @sysconfdir@/libvirt/libvirtd.conf tcp_port setting +# This must match the @sysconfdir@/libvirt/@service@.conf tcp_port setting # when using systemd version < 227 ListenStream=3D16509 -Service=3Dlibvirtd.service +Service=3D@service@.service =20 [Install] WantedBy=3Dsockets.target diff --git a/src/remote/libvirtd-tls.socket.in b/src/remote/libvirtd-tls.so= cket.in index e2b1f839de..8b89737fff 100644 --- a/src/remote/libvirtd-tls.socket.in +++ b/src/remote/libvirtd-tls.socket.in @@ -1,14 +1,15 @@ [Unit] -Description=3DLibvirt TLS IP socket -Before=3Dlibvirtd.service -BindsTo=3Dlibvirtd.socket -After=3Dlibvirtd.socket +Description=3D@name@ TLS IP socket +Before=3D@service@.service +BindsTo=3D@service@.socket +After=3D@service@.socket +@deps@ =20 [Socket] -# This must match the @sysconfdir@/libvirt/libvirtd.conf tls_port setting +# This must match the @sysconfdir@/libvirt/@service@.conf tls_port setting # when using systemd version < 227 ListenStream=3D16514 -Service=3Dlibvirtd.service +Service=3D@service@.service =20 [Install] WantedBy=3Dsockets.target diff --git a/src/remote/libvirtd.socket.in b/src/remote/libvirtd.socket.in index 872f70eb21..cb61409e23 100644 --- a/src/remote/libvirtd.socket.in +++ b/src/remote/libvirtd.socket.in @@ -1,12 +1,13 @@ [Unit] -Description=3DLibvirt local socket -Before=3Dlibvirtd.service +Description=3D@name@ local socket +Before=3D@service@.service +@deps@ =20 [Socket] -# The directory must match the @sysconfdir@/libvirt/libvirtd.conf unix_soc= k_dir setting +# The directory must match the @sysconfdir@/libvirt/@service@.conf unix_so= ck_dir setting # when using systemd version < 227 -ListenStream=3D@localstatedir@/run/libvirt/libvirt-sock -Service=3Dlibvirtd.service +ListenStream=3D@localstatedir@/run/libvirt/@sockprefix@-sock +Service=3D@service@.service SocketMode=3D0666 =20 [Install] --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list