From nobody Mon Feb 9 16:01:36 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=1695831674; cv=none; d=zohomail.com; s=zohoarc; b=A+nPUOEHI4opyL5mshPHDlzHkLUgqteheTLjoEC2O2byQvEdsF/Kg57Vhnsp3p6l/dLqyDWy38otZGy0WNYYF9uwBtq8uL/npvBKxm5MRayuTOgEpQQr0JYIZNz9hOBSncmJ4ZkH5WW9UNPD1whL9Ro5wgglRzlri13eJ/vZSjs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695831674; 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=cJDxOVmTcJ9RfMGHCPPsKGsR0Vu1C5xBDlFNQa2FkpI=; b=JIMYRlUiC3rF0IHgonR6HdNapwdCP0vNWI6S4saYLvFeeCZOO5J7FoGeJf0Lne/tmPvUROZnKMjmQC7ffP5oiDcif1cZ4+V20gn5aW51nQ9LvXGFXtElEFafLkz/A7itBkQW0y4lL6S6J1P24z8rKWaGghPJFaouERCU0JRfRjY= 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 1695831674062887.7718821718469; Wed, 27 Sep 2023 09:21:14 -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-284-1qXMPzlkMUWsrZpCw8RoQg-1; Wed, 27 Sep 2023 12:21:10 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 A37221C06E0C; Wed, 27 Sep 2023 16:21:03 +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 605811005B96; Wed, 27 Sep 2023 16:21:02 +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 BE1EE19465A0; Wed, 27 Sep 2023 16:21:01 +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 A0C5219465A2 for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9391A1054FC9; Wed, 27 Sep 2023 16:19:47 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 275731054FC8 for ; Wed, 27 Sep 2023 16:19:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695831673; 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=cJDxOVmTcJ9RfMGHCPPsKGsR0Vu1C5xBDlFNQa2FkpI=; b=Q/lXsRmX+A6wp5nKZhY422JMszfI9BdoHSws16UqJv0WwrEoCYHKoyvD1qWu/BJVD7AKaO fvYZ104HOxonu5JoggMg5a5ERCALyR5JJadQ7uX0Yuax+XlqWFOhEKG1ocqz/NtarsVtLT PPdoU2LljPGiRk6P8ryzS23cIhVSnD8= X-MC-Unique: 1qXMPzlkMUWsrZpCw8RoQg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 15/33] systemd: Switch virtvzd to common templates Date: Wed, 27 Sep 2023 18:19:16 +0200 Message-ID: <20230927161934.181728-16-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.3 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: 1695831675998100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/vz/meson.build | 5 +---- src/vz/virtvzd.service.extra.in | 2 ++ src/vz/virtvzd.service.in | 26 -------------------------- 3 files changed, 3 insertions(+), 30 deletions(-) create mode 100644 src/vz/virtvzd.service.extra.in delete mode 100644 src/vz/virtvzd.service.in diff --git a/src/vz/meson.build b/src/vz/meson.build index 9c2eb90463..842cdb6136 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -48,11 +48,8 @@ if conf.has('WITH_VZ') =20 virt_daemon_units +=3D { 'service': 'virtvzd', - 'service_in': files('virtvzd.service.in'), 'name': 'Libvirt vz', - 'socket_in': libvirtd_socket_in, - 'socket_ro_in': libvirtd_socket_ro_in, - 'socket_admin_in': libvirtd_socket_admin_in, + 'service_extra_in': files('virtvzd.service.extra.in'), } =20 openrc_init_files +=3D { diff --git a/src/vz/virtvzd.service.extra.in b/src/vz/virtvzd.service.extra= .in new file mode 100644 index 0000000000..ba3ad13ace --- /dev/null +++ b/src/vz/virtvzd.service.extra.in @@ -0,0 +1,2 @@ +[Unit] +After=3Dremote-fs.target diff --git a/src/vz/virtvzd.service.in b/src/vz/virtvzd.service.in deleted file mode 100644 index 5521e89e10..0000000000 --- a/src/vz/virtvzd.service.in +++ /dev/null @@ -1,26 +0,0 @@ -[Unit] -Description=3DVirtualization vz daemon -Conflicts=3Dlibvirtd.service -Requires=3Dvirtvzd.socket -Requires=3Dvirtvzd-ro.socket -Requires=3Dvirtvzd-admin.socket -After=3Dnetwork.target -After=3Ddbus.service -After=3Dapparmor.service -After=3Dremote-fs.target -Documentation=3Dman:virtvzd(8) -Documentation=3Dhttps://libvirt.org - -[Service] -Type=3Dnotify -Environment=3DVIRTVZD_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@initconfdir@/virtvzd -ExecStart=3D@sbindir@/virtvzd $VIRTVZD_ARGS -ExecReload=3D/bin/kill -HUP $MAINPID -Restart=3Don-failure - -[Install] -WantedBy=3Dmulti-user.target -Also=3Dvirtvzd.socket -Also=3Dvirtvzd-ro.socket -Also=3Dvirtvzd-admin.socket --=20 2.41.0