From nobody Mon Feb 9 17:05:04 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1695668433; cv=none; d=zohomail.com; s=zohoarc; b=GvoT+9Z4ji9pd7EkQ+v3LmB/tcCWAW3+0sX9OgTOM8MvSKmyOXaEEjBpettEa/rd9v58CatAMlsNQlb2/omWTrc8iFXO+Tcu07xEQWHTFawG/f+ckfPzql9bh2an/ySEmQcYkI95xvbK/svVfGK5UhYzPMT5eMHvcXH5+i5eSic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695668433; 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=DhqAphZT9pJVE0gEQLVlLbVL+N6M49hlkLkJAvBQC/Y=; b=eK/aySEJ11ja8AAF7lNqhK0L7YQ4RdkkkGwhRB4855N1pNIYMJUDPBO4de9C4w2XZzh/lHQK9dFVB/Bvh8a9xvM4X4ZS8CyuQRLkf8xqugrM0sk8q/tR5Ki725sgYEfKMr6ISSDqI8g+t9EX4il+QWyRYG5sQEwgnKUkjTTZr18= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1695668433292945.2832320306196; Mon, 25 Sep 2023 12:00:33 -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-249-AR7J4QG6P22JnFb2I83vcA-1; Mon, 25 Sep 2023 15:00:17 -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 5CD301C0151B; Mon, 25 Sep 2023 19:00:01 +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 3F03310EA0; Mon, 25 Sep 2023 19:00:01 +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 D626819466FC; Mon, 25 Sep 2023 19:00:00 +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 F1AF91946A4B for ; Mon, 25 Sep 2023 18:59:25 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D21A6711296; 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 65580711293 for ; Mon, 25 Sep 2023 18:59:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695668432; 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=DhqAphZT9pJVE0gEQLVlLbVL+N6M49hlkLkJAvBQC/Y=; b=gRNeYHj0M/JX2S6H/ecIiuDCOfU/W5NIfPDJt1ncQkCBcxBEF7J/Mxx85m1hd8BlAb2+Mb owwLIZ6O33MrNSqWvfTYE/s8osJK1kGp6Nsl5orEnnEm/G5EjuYa7mApFM7DJEpN4GpMEG xkvj99OUsYMtK4jLInfdq53PQnyUNeU= X-MC-Unique: AR7J4QG6P22JnFb2I83vcA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 24/42] systemd: Switch virtvboxd to common templates Date: Mon, 25 Sep 2023 20:58:22 +0200 Message-ID: <20230925185840.880191-25-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.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: 1695668434494100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani --- src/vbox/meson.build | 7 +++---- src/vbox/virtvboxd.service.in | 26 -------------------------- 2 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 src/vbox/virtvboxd.service.in diff --git a/src/vbox/meson.build b/src/vbox/meson.build index 2d6b71ab8f..e07c87eaaa 100644 --- a/src/vbox/meson.build +++ b/src/vbox/meson.build @@ -57,11 +57,10 @@ if conf.has('WITH_VBOX') =20 virt_daemon_units +=3D { 'service': 'virtvboxd', - 'service_in': files('virtvboxd.service.in'), 'name': 'Libvirt vbox', - 'socket_in': libvirtd_socket_in, - 'socket_ro_in': libvirtd_socket_ro_in, - 'socket_admin_in': libvirtd_socket_admin_in, + 'service_unit_extra': [ + 'After=3Dremote-fs.target', + ], } =20 openrc_init_files +=3D { diff --git a/src/vbox/virtvboxd.service.in b/src/vbox/virtvboxd.service.in deleted file mode 100644 index a567ed2443..0000000000 --- a/src/vbox/virtvboxd.service.in +++ /dev/null @@ -1,26 +0,0 @@ -[Unit] -Description=3DVirtualization vbox daemon -Conflicts=3Dlibvirtd.service -Requires=3Dvirtvboxd.socket -Requires=3Dvirtvboxd-ro.socket -Requires=3Dvirtvboxd-admin.socket -After=3Dnetwork.target -After=3Ddbus.service -After=3Dapparmor.service -After=3Dremote-fs.target -Documentation=3Dman:virtvboxd(8) -Documentation=3Dhttps://libvirt.org - -[Service] -Type=3Dnotify -Environment=3DVIRTVBOXD_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@initconfdir@/virtvboxd -ExecStart=3D@sbindir@/virtvboxd $VIRTVBOXD_ARGS -ExecReload=3D/bin/kill -HUP $MAINPID -Restart=3Don-failure - -[Install] -WantedBy=3Dmulti-user.target -Also=3Dvirtvboxd.socket -Also=3Dvirtvboxd-ro.socket -Also=3Dvirtvboxd-admin.socket --=20 2.41.0