From nobody Tue Feb 10 00:59:09 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=1695668382; cv=none; d=zohomail.com; s=zohoarc; b=MTbSFaqRh/jLh31IxyYB5Ou7pw+Krinjvvlbvpp7UgxoAEgoQ/ERsvY7UWwHww+XhvqpERYPGc5gzVR9i+ookMi+gGfhvasAazPDfBZ6Ewf3sIRckQvuW22oWq8yYr0GmfBJbw37EuFLzYMRvWdphnIzJZpwK/ZSFG6er6GbFPA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668382; 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=foV7h9HS1392ynDwIgGcItYuV7baM+rZntjLoqtQKTw=; b=kHihhlmg8GLOrRhR57bByLpR4a7PVduhQrFbmO6bxPFFchVzAFPYvWNzBURh9skZoo/9cr/vIDTKEZsXYd7TF7Osd8FmItKxSWcA9zfBk81zF3V1VPNN40L2doIZtJbevqs0PwiX1YT1RfjW65kd8OkVdmI75IuUBUZ4hPBWuI0= 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 169566838283214.425899008796591; Mon, 25 Sep 2023 11:59:42 -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-130-iNaWBakXMAeW4CPCXgzHlg-1; Mon, 25 Sep 2023 14:59:37 -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 4A50488B7AE; Mon, 25 Sep 2023 18:59:29 +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 358CF1055466; Mon, 25 Sep 2023 18:59:29 +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 5B9001946A41; Mon, 25 Sep 2023 18:59:25 +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 762F7194658C for ; Mon, 25 Sep 2023 18:59:24 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 63F1D711286; Mon, 25 Sep 2023 18:59:24 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.198]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EB96371129C for ; Mon, 25 Sep 2023 18:59:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668381; 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=foV7h9HS1392ynDwIgGcItYuV7baM+rZntjLoqtQKTw=; b=ibgRb3Fk0X2/rAscuKRh98U8mhkLjFpg1iPZCEjbdWPZkMLE7CKWByfS+8NQLbP8wWr2wL cmzL9NrfQSJI+ie3ufjKcNG8IiZs4Wm2FPs7hY6CVnq9HnXzmjhZ5rUvj5KIgmOTrtdLdn qjBPMYzXSAJgLPSzX0zpBRX+h7EkYIQ= X-MC-Unique: iNaWBakXMAeW4CPCXgzHlg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 22/42] systemd: Switch virtstoraged to common templates Date: Mon, 25 Sep 2023 20:58:20 +0200 Message-ID: <20230925185840.880191-23-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.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: 1695668384314100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani --- src/storage/meson.build | 8 ++++---- src/storage/virtstoraged.service.in | 27 --------------------------- 2 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 src/storage/virtstoraged.service.in diff --git a/src/storage/meson.build b/src/storage/meson.build index e0a1e9f4de..90b8af4e41 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -111,11 +111,11 @@ if conf.has('WITH_STORAGE') =20 virt_daemon_units +=3D { 'service': 'virtstoraged', - 'service_in': files('virtstoraged.service.in'), 'name': 'Libvirt storage', - 'socket_in': libvirtd_socket_in, - 'socket_ro_in': libvirtd_socket_ro_in, - 'socket_admin_in': libvirtd_socket_admin_in, + 'service_unit_extra': [ + 'After=3Discsid.service', + 'After=3Dremote-fs.target', + ], } =20 openrc_init_files +=3D { diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged= .service.in deleted file mode 100644 index 235fbc6798..0000000000 --- a/src/storage/virtstoraged.service.in +++ /dev/null @@ -1,27 +0,0 @@ -[Unit] -Description=3DVirtualization storage daemon -Conflicts=3Dlibvirtd.service -Requires=3Dvirtstoraged.socket -Requires=3Dvirtstoraged-ro.socket -Requires=3Dvirtstoraged-admin.socket -After=3Dnetwork.target -After=3Ddbus.service -After=3Discsid.service -After=3Dapparmor.service -After=3Dremote-fs.target -Documentation=3Dman:virtstoraged(8) -Documentation=3Dhttps://libvirt.org - -[Service] -Type=3Dnotify -Environment=3DVIRTSTORAGED_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@initconfdir@/virtstoraged -ExecStart=3D@sbindir@/virtstoraged $VIRTSTORAGED_ARGS -ExecReload=3D/bin/kill -HUP $MAINPID -Restart=3Don-failure - -[Install] -WantedBy=3Dmulti-user.target -Also=3Dvirtstoraged.socket -Also=3Dvirtstoraged-ro.socket -Also=3Dvirtstoraged-admin.socket --=20 2.41.0