From nobody Mon Feb 9 16:45:17 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=1695834716; cv=none; d=zohomail.com; s=zohoarc; b=mQl/hmrFOsNR4G54t97eV4JrX/uRBbl95Q2J8daObPM4+zBvfFiuPAtT7rXZeX2H+NL76rv2amyCTDa1wKM6EUhtIaI+KwEUw4DXBsbqOuXqbdysG8caDg9g5Rl77yxDfdHMzQf0sQrgaAmg5OXJHe6cRgNEaLVaQwVVdbT/O1w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695834716; 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=pYrQilkjqqzNBSsUIbdr0dpKHMQVEfH0xQX0Yw3wyBg=; b=iAnpT6fShuago34Pl3d4XK1tQm5r/OWoXVdzjoP6/G0JwWAEVjpPKJCxDS+V69Ibu+rmys4ne7PhGlUQZ5+x+e3SqCR1iRk45zhTkMwL/46MtvWoigLDVwbOVv+8HLn8lo9eXerLA2DVor7R7pf9cBerkn05TXP8bYVwnS+K6Us= 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 1695834716841546.2155885956587; Wed, 27 Sep 2023 10:11:56 -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-480-Jc9SXqEZNwKB71H_YdaU5g-1; Wed, 27 Sep 2023 13:11:53 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 2B8B9185A790; Wed, 27 Sep 2023 17:11:50 +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 13F57170EC; Wed, 27 Sep 2023 17:11:50 +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 DAD9D1946A50; Wed, 27 Sep 2023 17:11:27 +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 B474719466E9 for ; Wed, 27 Sep 2023 16:20:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2940D1054FC6; Wed, 27 Sep 2023 16:19:46 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B0C031054FC2 for ; Wed, 27 Sep 2023 16:19:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695834715; 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=pYrQilkjqqzNBSsUIbdr0dpKHMQVEfH0xQX0Yw3wyBg=; b=Ebe2D6YQAaILbC1oO7VZ8QfKTXypYvWoayWgI2ezJrI0XIWe07lVOONGpG/cmMC53IZ0Db 5nsa36VWD0nvgup2zGOnLCLEPRPhx+NRmAkzVyEd4Ul4t8nRL2QCh38gqpIK+rZ8NNs+ik DR+ofQ3hhORVkyeGITG8WMKiehosIkQ= X-MC-Unique: Jc9SXqEZNwKB71H_YdaU5g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH v2 13/33] systemd: Switch virtstoraged to common templates Date: Wed, 27 Sep 2023 18:19:14 +0200 Message-ID: <20230927161934.181728-14-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.5 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: 1695834717321100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- src/storage/meson.build | 5 +---- src/storage/virtstoraged.service.extra.in | 3 +++ src/storage/virtstoraged.service.in | 27 ----------------------- 3 files changed, 4 insertions(+), 31 deletions(-) create mode 100644 src/storage/virtstoraged.service.extra.in delete mode 100644 src/storage/virtstoraged.service.in diff --git a/src/storage/meson.build b/src/storage/meson.build index e0a1e9f4de..fb7feea81d 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -111,11 +111,8 @@ 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_extra_in': files('virtstoraged.service.extra.in'), } =20 openrc_init_files +=3D { diff --git a/src/storage/virtstoraged.service.extra.in b/src/storage/virtst= oraged.service.extra.in new file mode 100644 index 0000000000..d134ae18da --- /dev/null +++ b/src/storage/virtstoraged.service.extra.in @@ -0,0 +1,3 @@ +[Unit] +After=3Discsid.service +After=3Dremote-fs.target 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