From nobody Mon Feb 9 12:15:26 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=fail(p=quarantine dis=quarantine) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1670026737; cv=none; d=zohomail.com; s=zohoarc; b=dg6TlvZIeON0SpiOQ7oMlvNR9U59xKgn4E8k7lvg3n5OvSdWBzDVxpgKSodBDu1er6Y5u17udfUAPQeyLW3pPVIZAvVh2i0Jur8oyZhD4JikNIl36f66mlhSU7okQWCaDR3JQjQH8i69+xz9+uEqjdItmCi1VT/JmhJPNFUv8Y0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670026737; 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=9qBVb8phLG/t97TXVL/apgUxnL4yeaDk/lg15iMbBrs=; b=Pe/13JX4qxvMgOS7afuY7C9mx82c7DTuxw/2CMNqtIRNKbSq1LOMbTxqCBF5zDBK5Eun4RLcPj9HdITpcBqWQnKZi1LrLTsGljCRm7Hk0+RtAJexJ1VvbaBPHxoiEHqiRQmQfi6IKtgx9krn7gXiOAOgLt2THrUwzFjJtZ2YLko= 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=fail header.from= (p=quarantine dis=quarantine) 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 1670026737099213.07412790140552; Fri, 2 Dec 2022 16:18:57 -0800 (PST) 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-194-IDfwwiOjO_qrjnRgTUDVCA-1; Fri, 02 Dec 2022 19:18:54 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3CA51857D15; Sat, 3 Dec 2022 00:18: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 262982022C2B; Sat, 3 Dec 2022 00:18: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 D3575194707D; Sat, 3 Dec 2022 00:18:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EE6CD194707C for ; Sat, 3 Dec 2022 00:18:23 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E054540C83BB; Sat, 3 Dec 2022 00:18:22 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast10.extmail.prod.ext.rdu2.redhat.com [10.11.55.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D772140CA40C for ; Sat, 3 Dec 2022 00:18:21 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (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 186A61C06EEA for ; Sat, 3 Dec 2022 00:18:10 +0000 (UTC) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2053.outbound.protection.outlook.com [40.107.6.53]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-256-qf07SCcAMPq6E2bzsMZclg-1; Fri, 02 Dec 2022 19:17:57 -0500 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) by VI1PR04MB7168.eurprd04.prod.outlook.com (2603:10a6:800:129::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.10; Sat, 3 Dec 2022 00:17:54 +0000 Received: from AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::c5dc:fe50:9918:744f]) by AM0PR04MB4899.eurprd04.prod.outlook.com ([fe80::c5dc:fe50:9918:744f%7]) with mapi id 15.20.5880.010; Sat, 3 Dec 2022 00:17:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670026736; 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=9qBVb8phLG/t97TXVL/apgUxnL4yeaDk/lg15iMbBrs=; b=SZAgbyFnVczyoXggrt+EAHekcLwOWWoyBffySxfoG977EyM9H/3UaO8E0NazyaYvEuOsDL 1GvMNLKfnrS539+EOiOgr/T3faDbfsk+A+ClMDtQNr9nXY8Iwx+1isbEDNsqcVukyt1zIp /jtxRIYBxOaeeac35TaQteTVYT25cSs= X-MC-Unique: IDfwwiOjO_qrjnRgTUDVCA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: qf07SCcAMPq6E2bzsMZclg-1 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH 3/7] spec: Move virtproxyd to a new subpackage libvirt-daemon-proxy Date: Fri, 2 Dec 2022 17:17:34 -0700 Message-ID: <20221203001738.11442-4-jfehlig@suse.com> In-Reply-To: <20221203001738.11442-1-jfehlig@suse.com> References: <20221203001738.11442-1-jfehlig@suse.com> X-ClientProxiedBy: FR2P281CA0048.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:92::19) To AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR04MB4899:EE_|VI1PR04MB7168:EE_ X-MS-Office365-Filtering-Correlation-Id: 9afd3120-2c69-4498-1964-08dad4c3d2b2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: dQJUwUwbZ6BAw8wLbqnaGbeP/ZRFqSiaDFgLDP0J0ogG70AHH7pYIIamIINUkDW5PgPck1mX5dhwq6Sxmbi/t/x0oCzj2JVF74CWtKNrh9Ydz61n7ytKSR01Xnmg89XPPEMjMFulwgyV9MVunZV6SbJxRdjEr8q33Bxd6CN3marEOtBjQY8GwjT+X6qFW1xKnE42/8sX4ZkEmFJarlmyLL43DPjci4gI3xgRSZkzD4UBHWlXrY/4TTttiuEu1ze6d6Hl8pGlNiLVC/Uc7fSvvRSfvFVqv8uUhG80hhrzi4aRoM9lMYQX88K/d1dVNO1SYXFbWZ/ZFMOhGpfP0Q8/gfLPzUXZ/QjQ3B4O9d7fu3gD9C2SRIHFPxJv+Bhw6tb2YtwldLR2M7jkV0fYN4l1CZrQdvhedI33d0825bE3Lf0DxxbdWt5SBE07PG7OWOlMj1y6L6SRdjwVjnoXTkTQ4uZWDyUH4yB2DpFcFF4toiDh1MbcgJBMKoz1d6tU2paZyEPP9dKCV8kEAEXIr7C2LlCk5KlI8ztN0HbQbN6O2TqU2BZUrxpaQYU7zHJTh77FfVCN9WoFEd213NY0sRGndMJQXByIK38YlOpNxzA1i1wN4lObEbXRXJXbPQtmpKmkCuuFO/voBug7Jzak1DbXEIvujGs5SAUi50MeB4lTStV1vpyYZ2Xp+ro3vMmpTLJ4 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR04MB4899.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(396003)(346002)(136003)(39860400002)(376002)(366004)(451199015)(36756003)(86362001)(6486002)(478600001)(6512007)(6506007)(186003)(26005)(6666004)(5660300002)(41300700001)(8936002)(66946007)(316002)(66556008)(66476007)(6916009)(8676002)(2906002)(38100700002)(2616005)(83380400001)(1076003); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?psw+Xk1vjDl7josQ+zGnEfr84/Waxar7fglc85TwKZlUs4gOjqp/lg+FjOh6?= =?us-ascii?Q?lYW6h6l1iXhQMr3Fa7/LrsMKOAFnDX1ho6XXe/vzE2x4DseK01W1zBpy8IBU?= =?us-ascii?Q?nSds9ygqSnjwS+GZ734Acyhe672chtxG0lx6VwNbBawkkKedlGEZZVcGLMIY?= =?us-ascii?Q?UA7yiBQO0qjLU6iTrnimPCShbBJ3aUep9euGpjCRwzKlrtB1aCizPH04aXFL?= =?us-ascii?Q?er/SYf5a5WVSqBukHkvU287IrFh9Cj/oINHo2R7N5NDLE7OkzEd+6ZLKMLIJ?= =?us-ascii?Q?KhRv3Y5CMCMbQxmlJqfltzCYgzHyLW05bic4JtxR/0hkQsWjjjFjZnOFSbED?= =?us-ascii?Q?zraXXx7J5I1WgXSK/kjKClSSMJsnQd9MO822tCTP1veyK852dHmTqD0JSUcm?= =?us-ascii?Q?wM97uMyUFd/LJj3hosCFEqpZBElsXQYDaCyc/ZwdOJPLM6omSWkVtRKK+4Yt?= =?us-ascii?Q?vfBpM143U70ageWe7x5I9kQooi4sdGxkSsOrtUopdYe1bV/ftgbK3MF2RFhm?= =?us-ascii?Q?fhyeuRdd1bT2X8sso/bxCZg/vZHsa9kRdHPEsHS9r07kZoDwuzEovGL91/Iv?= =?us-ascii?Q?xLgrn+1dJa3ud2aV7t4pTBLt/MM3G1BEddWTSXjj25S6GXETFw67aG8XJG9j?= =?us-ascii?Q?tEbAP2IQEBdh5rV1uo/k6u0RwKbG1jZTd8FB7jJh44/GU5NTZ6JvUdiKDlRy?= =?us-ascii?Q?HFIyxFgBelEtMmjzkKGKQJfulMPNjr3+0Bbjpbg+vNgzOoKjQortkMBYSMcE?= =?us-ascii?Q?KF1RceyIHiTC2v6NDEOQkPv0ERBep/TjzNBNLCri+O1c7G/rio7eMW7/mDqx?= =?us-ascii?Q?XdPemT+pDiYQRz4Wp3LMQ4/R2rZN3Ywq3eE3WTOac1nIPzv7UMQpTnlKKIai?= =?us-ascii?Q?vFDWi9g87qArQGwhk4rphmoYLNX82llqI8ArVSOfJOffDUWID6Mo9SFr5KNH?= =?us-ascii?Q?yPVmI5fhttFyqFUGGIBuEEqSlJq56DH1e7mk15nvRdODtPbctGgoy6KWvs60?= =?us-ascii?Q?xvwk3XOXBPGzUwX1qzRLGC5/2LfeW8cF1O8gazev9v4jiT+1NwpTsXaXHroR?= =?us-ascii?Q?+LZWMtbK3mjeXtcit0VDlBgIj7PLkJvhW1gKIn8lX/m53nWMP7Krpsv7ys1t?= =?us-ascii?Q?RJVG445p3PW3h1tgyf9W3IvY/x1sFAxFqa0XaGEtVuVFEx3fSFqQENvaNqHX?= =?us-ascii?Q?Yo34jfv4Nye0XY+pHcvb7gfQH452/5ANqsN1aXDeXdAJ4gSAFhKl08VGCXo7?= =?us-ascii?Q?NTurDTPebHQLg7yNkTNWK7Yu9+rYiU3jJxYLaj5qbOOiOYGUw6bLINPL/uAF?= =?us-ascii?Q?VIkokmso78tRtMnJ+pRbEsURmhV2Qy+WIbE6LiqjwxDXtOebDRjfd/81pI3j?= =?us-ascii?Q?wY7Qa09yg2HbDowl9DaqjIlpFjuTOmxow8jxfLXpmkK2QP03IYm2BlxCbXjd?= =?us-ascii?Q?zMGHkdkLnSnFYh/yNEB9NzzEliZKg5TYKHA6bjX5p30ElN0/SQocTP5hpGah?= =?us-ascii?Q?sP1YO3kD/hEb7CNKBa/v1QNMFzn1x8wq5L1ft1JRh0OyrhezLnNYeX+/tz+9?= =?us-ascii?Q?gIMdMU6978jQqPQ6I2ShkKo9sjARaTFjJsLzFwsa?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9afd3120-2c69-4498-1964-08dad4c3d2b2 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB4899.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Dec 2022 00:17:54.6351 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Prp5DPZsCDyCwpjpHdPneIqIjVzqXir0SL1Yx6Sz/15dWfud3lEe88LJdAS3xsO6iinEOCLfkcveLd9rxom+IA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7168 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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.4 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: 1670026738345100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jim Fehlig Reviewed-by: Daniel P. Berrang=C3=A9 --- libvirt.spec.in | 57 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f4cd0710b8..f6d644a3ae 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -442,6 +442,7 @@ Summary: Server side daemon and supporting files for li= bvirt library Requires: libvirt-libs =3D %{version}-%{release} Requires: libvirt-daemon-lock =3D %{version}-%{release} Requires: libvirt-daemon-log =3D %{version}-%{release} +Requires: libvirt-daemon-proxy =3D %{version}-%{release} =20 # The libvirt-guests.sh script requires virsh from libvirt-client subpacka= ge, # but not every deployment wants to use libvirt-guests service. Using @@ -510,6 +511,14 @@ Requires: libvirt-libs =3D %{version}-%{release} %description daemon-log Server side daemon used to manage logs from virtual machine consoles =20 +%package daemon-proxy +Summary: Server side daemon providing libvirtd proxy +Requires: libvirt-libs =3D %{version}-%{release} + +%description daemon-proxy +Server side daemon providing functionality previously provided by +the monolithic libvirtd + %package daemon-config-network Summary: Default configuration files for the libvirtd daemon =20 @@ -1447,7 +1456,7 @@ fi \ %define libvirt_daemon_systemd_preun_priv() %systemd_preun %1.service %1-a= dmin.socket %1.socket =20 %pre daemon -%libvirt_sysconfig_pre libvirtd virtproxyd libvirt-guests +%libvirt_sysconfig_pre libvirtd libvirt-guests # 'libvirt' group is just to allow password-less polkit access to # libvirtd. The uid number is irrelevant, so we use dynamic allocation # described at the above link. @@ -1456,9 +1465,7 @@ getent group libvirt >/dev/null || groupadd -r libvirt exit 0 =20 %post daemon -%if %{with_modular_daemons} -%libvirt_daemon_systemd_post_inet virtproxyd -%else +%if ! %{with_modular_daemons} %libvirt_daemon_systemd_post_inet libvirtd %endif =20 @@ -1470,14 +1477,13 @@ exit 0 %systemd_preun libvirt-guests.service =20 %libvirt_daemon_systemd_preun_inet libvirtd -%libvirt_daemon_systemd_preun_inet virtproxyd =20 %postun daemon /bin/systemctl daemon-reload >/dev/null 2>&1 || : %systemd_postun libvirt-guests.service =20 %posttrans daemon -%libvirt_sysconfig_posttrans libvirtd virtproxyd libvirt-guests +%libvirt_sysconfig_posttrans libvirtd libvirt-guests if test %libvirt_daemon_needs_restart libvirtd then # See if user has previously modified their install to @@ -1548,6 +1554,20 @@ fi %posttrans daemon-log %libvirt_sysconfig_posttrans virtlogd =20 +%pre daemon-proxy +%libvirt_sysconfig_pre virtproxyd + +%post daemon-proxy +%if %{with_modular_daemons} +%libvirt_daemon_systemd_post_inet virtproxyd +%endif + +%preun daemon-proxy +%libvirt_daemon_systemd_preun_inet virtproxyd + +%posttrans daemon-proxy +%libvirt_sysconfig_posttrans virtproxyd + %pre daemon-driver-network %libvirt_sysconfig_pre virtnetworkd =20 @@ -1826,16 +1846,9 @@ exit 0 %{_unitdir}/libvirtd-admin.socket %{_unitdir}/libvirtd-tcp.socket %{_unitdir}/libvirtd-tls.socket -%{_unitdir}/virtproxyd.service -%{_unitdir}/virtproxyd.socket -%{_unitdir}/virtproxyd-ro.socket -%{_unitdir}/virtproxyd-admin.socket -%{_unitdir}/virtproxyd-tcp.socket -%{_unitdir}/virtproxyd-tls.socket %{_unitdir}/virt-guest-shutdown.target %{_unitdir}/libvirt-guests.service %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf -%config(noreplace) %{_sysconfdir}/libvirt/virtproxyd.conf %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf %config(noreplace) %{_prefix}/lib/sysctl.d/60-libvirtd.conf =20 @@ -1858,8 +1871,6 @@ exit 0 =20 %{_datadir}/augeas/lenses/libvirtd.aug %{_datadir}/augeas/lenses/tests/test_libvirtd.aug -%{_datadir}/augeas/lenses/virtproxyd.aug -%{_datadir}/augeas/lenses/tests/test_virtproxyd.aug =20 %{_datadir}/polkit-1/actions/org.libvirt.unix.policy %{_datadir}/polkit-1/actions/org.libvirt.api.policy @@ -1872,7 +1883,6 @@ exit 0 %attr(0755, root, root) %{_bindir}/virt-ssh-helper =20 %attr(0755, root, root) %{_sbindir}/libvirtd -%attr(0755, root, root) %{_sbindir}/virtproxyd %attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh =20 %{_mandir}/man1/virt-admin.1* @@ -1880,7 +1890,6 @@ exit 0 %{_mandir}/man8/virt-ssh-helper.8* %{_mandir}/man8/libvirt-guests.8* %{_mandir}/man8/libvirtd.8* -%{_mandir}/man8/virtproxyd.8* =20 %{_bindir}/virt-host-validate %{_bindir}/virt-admin @@ -1910,6 +1919,20 @@ exit 0 %attr(0755, root, root) %{_sbindir}/virtlogd %{_mandir}/man8/virtlogd.8* =20 +%files daemon-proxy +%{_unitdir}/virtproxyd.service +%{_unitdir}/virtproxyd.socket +%{_unitdir}/virtproxyd-ro.socket +%{_unitdir}/virtproxyd-admin.socket +%{_unitdir}/virtproxyd-tcp.socket +%{_unitdir}/virtproxyd-tls.socket +%config(noreplace) %{_sysconfdir}/libvirt/virtproxyd.conf +%{_datadir}/augeas/lenses/virtproxyd.aug +%{_datadir}/augeas/lenses/tests/test_virtproxyd.aug +%attr(0755, root, root) %{_sbindir}/virtproxyd +%{_mandir}/man8/virtproxyd.8* + + %files daemon-config-network %dir %{_datadir}/libvirt/networks/ %{_datadir}/libvirt/networks/default.xml --=20 2.38.1