From nobody Mon Feb 9 15:30:05 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=fail(p=quarantine dis=quarantine) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1670026744; cv=none; d=zohomail.com; s=zohoarc; b=PTgwQYpvRmxfQl2g58jfoCqAl4qd518euYMz+LXyKRIq0PJia2Hz9/CNN7YowaGUk+nXfnnu5Y+atSTLtckGIF+hpk4L3+/HM1Dv0S1y6Do/uzy50sFyokp0YDugN0nkTbSjQMQvKZ2beEAANjpUqBlVvzG4zlqPIquSMvJtqgE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670026744; 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=qRgz7Ly+/rzX+BQWNItgf4kEksgOXNldeJzSY/wzfOo=; b=Y00aoBuh9sFhBVQIIaYzcfa+6LsSibDrmwU5oTqD/rLBHEx8TXpUGe9UIfr09nXV9PNHOgQocF2MLqsBxXF02CQksPGxv74CiJfmM0eP7sQGaG0Uytwi+49pmLz6N96CDRRrdM/zhSfZyWuVbPbGKK/RICAsKZIS0j5usHA+f2M= 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=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.129.124]) by mx.zohomail.com with SMTPS id 1670026744810103.19801185748781; Fri, 2 Dec 2022 16:19:04 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.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-483-yplYfpsSN9yDxO0p4oLFlA-1; Fri, 02 Dec 2022 19:18:55 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AE1941C06EEB; Sat, 3 Dec 2022 00:18:30 +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 B4F3940CA413; Sat, 3 Dec 2022 00:18:15 +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 78734194658F; Sat, 3 Dec 2022 00:18:13 +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 141B0194658F for ; Sat, 3 Dec 2022 00:18:13 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C40DB111E41C; Sat, 3 Dec 2022 00:18:11 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BC95D111E3FF for ; Sat, 3 Dec 2022 00:18:11 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (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 D8D41800B23 for ; Sat, 3 Dec 2022 00:17:59 +0000 (UTC) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2044.outbound.protection.outlook.com [40.107.6.44]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-81-T_q5tNfcM428P65k-3LHUA-1; Fri, 02 Dec 2022 19:17:52 -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:50 +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:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670026743; 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=qRgz7Ly+/rzX+BQWNItgf4kEksgOXNldeJzSY/wzfOo=; b=EkWQSz2Y5yyvaXmWnTwU1S80LqVKhQkTtZvINH5xG+vx001XdNt0p8Wh2ATMy11Ii+/Ee7 CX3O/EvbDjX9Gwr3GlPLXHRVv1W2dLp121qNMqA33NRm2mbqBn6ThBLezIf9U8ShZqWk+e 1q4Xu+0lOxLbewSFmWWcF5XaGMjY6Jw= X-MC-Unique: yplYfpsSN9yDxO0p4oLFlA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: T_q5tNfcM428P65k-3LHUA-1 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH 2/7] spec: Move virtlogd to a new subpackage libvirt-daemon-log Date: Fri, 2 Dec 2022 17:17:33 -0700 Message-ID: <20221203001738.11442-3-jfehlig@suse.com> In-Reply-To: <20221203001738.11442-1-jfehlig@suse.com> References: <20221203001738.11442-1-jfehlig@suse.com> X-ClientProxiedBy: FR2P281CA0038.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:92::11) 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: b18cf059-f8b1-4700-f3d8-08dad4c3d056 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: jsjCc1loDkmrCrQZotc9YoOLXIsassVLUNXCS+1NyHAsnzC1c/XO/6KCTKKicP3/4vshsGoa7KCGItOVV7fnhkMSjPchruqpan0B0TE3z9YLlz3iA+6RO6drLIyosexEnf5DYnh/4MqZJkqQpA+H9OdxsyFlzxGiZO7yvOdlr8ir4L6QztWMOe3AAMsuY//XnCxJ660vRso8eigrXX3WiZpWxLCdoVq/zqc/4ZdkrPTqbrrlBDSD1H4SobIDIv39+k1iPnPy5EJuhQvcIS7bs5vEoeieTV2Dl/qWul5dvgY8Ds3BTnVm3pSGRwZMfPFxLzwePUwp1jI8ocR2qyb+89BryrTgPBnWesp4XUZSc0BJrXSaT8Dxl3l3nAbsTRuZ3wAvfMt25ZlGdxJmox6ehAZX27WdmIMpbT6/uuM3eAHHd9TOKAV4Zbbns6rY6a4MiN9T305QutG1qqlxXXc7TvTNL3hM5VyDgIRXu4dHdalH7itlzy100IoqTVEahdlRLlbOOGK+7ajL2pB5NgibC41eaYHtqaczyzKN4SrgzdTHcblnV/Jyv+SBqAYxutnFgEL2WdkqOA1L+OCGTFT3I1u/C7jw662BQCjjQUYxT7skBlSTvyqzi9BZkDG1BOeB5bIJQ742EsGZQ4zMOuWfa1GCHfwTpyRcD68IknZme+reR8Z27PgTLW9exbAc657O 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?tWRiDNoX195D7/1SLPSdpa6HRRjJ/obW1gVjBWcK/1hU5vn+VBIDayGz/MoD?= =?us-ascii?Q?+kMIM9NEbK1Dn3MMI3WWqIFahdHyRPrB9gPLlidIM1ebDs01a+JU6fhJlFZV?= =?us-ascii?Q?+u/JqwSR8NvW9w1KdL/iZk5N48XCmbfQvzR9MAHQlTQBjv6aZvUws23YJMpG?= =?us-ascii?Q?Eh2JlZcjtl+GkyrGwA+I25TUny/tIY3l0khBY9FmD7iFLfgC47LiAWgCl/h7?= =?us-ascii?Q?1IEG/MR6mhBG8EhDBmmdh3gBOX+3weAU7H7jV12arNBqQDSzAQgHDyeINhS1?= =?us-ascii?Q?5Fng2x9NVGzokOpHJTOh+AQltuTxSuKLQLazFecHiCJ3NNkN2zNq7V8G6oz5?= =?us-ascii?Q?Q7LiTbnhdp9X1J/QDfpV6eO0hRut9ncdMSYXKsIMLcqDRG1F/L/rsRJfw1At?= =?us-ascii?Q?Pyg0PqDB/2olLeNAba1kwvf6JVXmnLeyjNI2m2iW0BGTJDyemykLnyMmlWVr?= =?us-ascii?Q?crWitCpXEvO4n20AuIGHzSOJGG+NbFhoJGgeCUFqcDQNnHjBWx/nDmEqGTz0?= =?us-ascii?Q?QjdugA9HLsayiKwxYUP16++2s4ipJZSuSea1+OleWsabUTJqDVdKAYx/025J?= =?us-ascii?Q?EuNFpUNkSvPN/c+ndEKKPdBMvWDAc1ddw2mRe5pA+e8lYwziYBRPSUk2oAnv?= =?us-ascii?Q?u+aydDzkECT3ThEPDdR89IYzs/GizhSAY8VXghLbPfZ7l8Xe6V/mQuAHvNEq?= =?us-ascii?Q?WQQP81OXQArBg+u6pvCWPpCqIV6KnEeo/UmZ8RrgqejEIq1u6JsPVcJjnJbI?= =?us-ascii?Q?lasiBRo8PQ1V1RriFZw7ffx/qAEK9y+9SaSNLTVjRBkHR9CQ8xMkd02PizvM?= =?us-ascii?Q?lGy+z2GXTomlpsJq6f1NoYc1BeAEDCYYXzBdsHa3SoTdUUS2oF3Sw/jcik4D?= =?us-ascii?Q?ksAphRdjb/jiyNGMevs825Lx0dOeoLbJ6BahqaPR93N1jNX6RyJmGNZ1j9Lg?= =?us-ascii?Q?27mCm2Z/qFKJh8g20EoE5GDphfizlLOlYXacqmqMidW6wnF96UcO2xFtfJ9y?= =?us-ascii?Q?LyDhDM7ODOHvJaMqggP4689dFxroS+1wPacmGMYJ8yknvdCSWsuh3hMqqRgq?= =?us-ascii?Q?KTyhuCjDV4swW3Q8Asg9icj6pSpLfCk+Lgh4/43tdFiHjEWUaCmjiuCOpJXm?= =?us-ascii?Q?s2oLz/qRV+kO+NOJSWn3dkTXDJvxZsaarAbuU49zGLpqHJDZ0AK0LEwEZKY+?= =?us-ascii?Q?aROVLZst0Q5vD2d9weNwQd9CjGBkasPUpOeT/VuTgKmpoDPvy1CPHa0AxXbs?= =?us-ascii?Q?mrfJ10Cmv0CLsEriQUaVM2p/Da8Qi7xW/Wwj9AfQ3JObOV79jR+x6MBHDztw?= =?us-ascii?Q?2TJ10WG2fPuwq4kDplFelzF32t6NfizQIxk+evXAQLYHi1DGeMZ7d8QHeGWn?= =?us-ascii?Q?6t/CRpoyIS1qO4SaQK6Rw7lsvmvfWaT1lMIWJXlZIoiu1H7iRJnbT/YMD+Tp?= =?us-ascii?Q?uoMxBCMvoKPTopqMvEXYUtl3cn48+Fcrh7GU7x2p7XBA6HnA23n0OSbQ5/wc?= =?us-ascii?Q?dgG/xAZEN8h5NuaUOLZO0u+f1ABL/V9vjDEzDLrmFsUj9dYABq/0airhFCeQ?= =?us-ascii?Q?MOrvq1Sd3ShP+UbNASjPM6JAhTT0y+f+E5Nj2REP?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b18cf059-f8b1-4700-f3d8-08dad4c3d056 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:50.8385 (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: 1OBSbujC8JYfMT58GaDHjV91PKkMc8yj2H9ZAlGh1zKWneVk4sFkQmgzK1SqPETN6EUbbZRLJX1CeLFBy8/7mQ== 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.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.1 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: 1670026746436100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jim Fehlig Reviewed-by: Daniel P. Berrang=C3=A9 --- libvirt.spec.in | 53 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index a586599f6e..f4cd0710b8 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -441,6 +441,7 @@ Summary: Server side daemon and supporting files for li= bvirt library # The client side, i.e. shared libs are in a subpackage Requires: libvirt-libs =3D %{version}-%{release} Requires: libvirt-daemon-lock =3D %{version}-%{release} +Requires: libvirt-daemon-log =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 @@ -502,6 +503,13 @@ Requires: libvirt-libs =3D %{version}-%{release} Server side daemon used to manage locks held against virtual machine resources =20 +%package daemon-log +Summary: Server side daemon for managing logs +Requires: libvirt-libs =3D %{version}-%{release} + +%description daemon-log +Server side daemon used to manage logs from virtual machine consoles + %package daemon-config-network Summary: Default configuration files for the libvirtd daemon =20 @@ -1439,7 +1447,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 virtlogd libvirt-guests +%libvirt_sysconfig_pre libvirtd virtproxyd 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. @@ -1448,7 +1456,6 @@ getent group libvirt >/dev/null || groupadd -r libvirt exit 0 =20 %post daemon -%libvirt_daemon_systemd_post_priv virtlogd %if %{with_modular_daemons} %libvirt_daemon_systemd_post_inet virtproxyd %else @@ -1464,17 +1471,13 @@ exit 0 =20 %libvirt_daemon_systemd_preun_inet libvirtd %libvirt_daemon_systemd_preun_inet virtproxyd -%libvirt_daemon_systemd_preun_priv virtlogd =20 %postun daemon /bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - /bin/systemctl reload-or-try-restart virtlogd.service >/dev/null 2>&1 = || : -fi %systemd_postun libvirt-guests.service =20 %posttrans daemon -%libvirt_sysconfig_posttrans libvirtd virtproxyd virtlogd libvirt-guests +%libvirt_sysconfig_posttrans libvirtd virtproxyd libvirt-guests if test %libvirt_daemon_needs_restart libvirtd then # See if user has previously modified their install to @@ -1527,6 +1530,24 @@ fi %posttrans daemon-lock %libvirt_sysconfig_posttrans virtlockd =20 +%pre daemon-log +%libvirt_sysconfig_pre virtlogd + +%post daemon-log +%libvirt_daemon_systemd_post_priv virtlogd + +%preun daemon-log +%libvirt_daemon_systemd_preun_priv virtlogd + +%postun daemon-log +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + /bin/systemctl reload-or-try-restart virtlogd.service >/dev/null 2>&1 = || : +fi + +%posttrans daemon-log +%libvirt_sysconfig_posttrans virtlogd + %pre daemon-driver-network %libvirt_sysconfig_pre virtnetworkd =20 @@ -1812,13 +1833,9 @@ exit 0 %{_unitdir}/virtproxyd-tcp.socket %{_unitdir}/virtproxyd-tls.socket %{_unitdir}/virt-guest-shutdown.target -%{_unitdir}/virtlogd.service -%{_unitdir}/virtlogd.socket -%{_unitdir}/virtlogd-admin.socket %{_unitdir}/libvirt-guests.service %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf %config(noreplace) %{_sysconfdir}/libvirt/virtproxyd.conf -%config(noreplace) %{_sysconfdir}/libvirt/virtlogd.conf %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf %config(noreplace) %{_prefix}/lib/sysctl.d/60-libvirtd.conf =20 @@ -1841,8 +1858,6 @@ exit 0 =20 %{_datadir}/augeas/lenses/libvirtd.aug %{_datadir}/augeas/lenses/tests/test_libvirtd.aug -%{_datadir}/augeas/lenses/virtlogd.aug -%{_datadir}/augeas/lenses/tests/test_virtlogd.aug %{_datadir}/augeas/lenses/virtproxyd.aug %{_datadir}/augeas/lenses/tests/test_virtproxyd.aug =20 @@ -1858,7 +1873,6 @@ exit 0 =20 %attr(0755, root, root) %{_sbindir}/libvirtd %attr(0755, root, root) %{_sbindir}/virtproxyd -%attr(0755, root, root) %{_sbindir}/virtlogd %attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh =20 %{_mandir}/man1/virt-admin.1* @@ -1866,7 +1880,6 @@ exit 0 %{_mandir}/man8/virt-ssh-helper.8* %{_mandir}/man8/libvirt-guests.8* %{_mandir}/man8/libvirtd.8* -%{_mandir}/man8/virtlogd.8* %{_mandir}/man8/virtproxyd.8* =20 %{_bindir}/virt-host-validate @@ -1887,6 +1900,16 @@ exit 0 %attr(0755, root, root) %{_sbindir}/virtlockd %{_mandir}/man8/virtlockd.8* =20 +%files daemon-log +%{_unitdir}/virtlogd.service +%{_unitdir}/virtlogd.socket +%{_unitdir}/virtlogd-admin.socket +%config(noreplace) %{_sysconfdir}/libvirt/virtlogd.conf +%{_datadir}/augeas/lenses/virtlogd.aug +%{_datadir}/augeas/lenses/tests/test_virtlogd.aug +%attr(0755, root, root) %{_sbindir}/virtlogd +%{_mandir}/man8/virtlogd.8* + %files daemon-config-network %dir %{_datadir}/libvirt/networks/ %{_datadir}/libvirt/networks/default.xml --=20 2.38.1