From nobody Thu May 2 19:26:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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=1612893078; cv=none; d=zohomail.com; s=zohoarc; b=IqE9SUMktpH5vPIaObIwDeEAdRPQuD504bT0u5mfBKWkV94pe1Csr+/twIl7C/mfspac6sFCY68JuVrBndG/i6zTOiHEIRgpeqCQ5RAWnGNDUnd+KipVuO0Qf6nrwZHOonVU3Uw6QR6DtOMvDgosS0BHjfAZPh1zOMoZNQy5yJA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612893078; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=JVOarvFZYHzLj+A847ylmn2UXVuUFH8cHqrHGK6E1cw=; b=JP62GKPRuiZ9yYx73HdgRwK6RwMuO+ZVmdWoi0oZ1an38kGPBGdc8XKJN2ZfV1PiZb8bwQLAWcWilMH7dlPoC/1yL4Tl6BkXcl1K2SlmRprXWbK9IzPfSEUCWVi02pMr6WB0RVLrV39doeX3aa/ngkFc83VGqaWpySsGirkf0XA= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1612893077852180.00161401911168; Tue, 9 Feb 2021 09:51:17 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-548-_Dlh25LTPXSZx3eSq6tJWg-1; Tue, 09 Feb 2021 12:51:14 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 766D8801978; Tue, 9 Feb 2021 17:51:08 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EA1E919CA8; Tue, 9 Feb 2021 17:51:05 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6C1494E58E; Tue, 9 Feb 2021 17:51:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 119Hp1QP025673 for ; Tue, 9 Feb 2021 12:51:01 -0500 Received: by smtp.corp.redhat.com (Postfix) id 76E092026D14; Tue, 9 Feb 2021 17:51:01 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 713892026D49 for ; Tue, 9 Feb 2021 17:50:59 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 17ED9811E87 for ; Tue, 9 Feb 2021 17:50:59 +0000 (UTC) Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [62.140.7.102]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-143-Z4oZuWGmOwS2r5lT7V4oeA-1; Tue, 09 Feb 2021 12:50:56 -0500 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04lp2052.outbound.protection.outlook.com [104.47.14.52]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-34-VJoRHgwTOZSQGsVbZigJJw-1; Tue, 09 Feb 2021 18:50:54 +0100 Received: from AM8PR04MB7970.eurprd04.prod.outlook.com (2603:10a6:20b:24f::9) by AM0PR04MB6066.eurprd04.prod.outlook.com (2603:10a6:208:13e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3825.21; Tue, 9 Feb 2021 17:50:52 +0000 Received: from AM8PR04MB7970.eurprd04.prod.outlook.com ([fe80::bdae:2ddc:55e0:9099]) by AM8PR04MB7970.eurprd04.prod.outlook.com ([fe80::bdae:2ddc:55e0:9099%5]) with mapi id 15.20.3846.025; Tue, 9 Feb 2021 17:50:52 +0000 Received: from linux-tbji.devlab.prv.suse.com (75.169.41.71) by AM0PR07CA0005.eurprd07.prod.outlook.com (2603:10a6:208:ac::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.11 via Frontend Transport; Tue, 9 Feb 2021 17:50:51 +0000 X-MC-Unique: _Dlh25LTPXSZx3eSq6tJWg-1 X-MC-Unique: Z4oZuWGmOwS2r5lT7V4oeA-1 X-MC-Unique: VJoRHgwTOZSQGsVbZigJJw-1 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH] build: Fix generation of virtproxyd socket files Date: Tue, 9 Feb 2021 10:50:31 -0700 Message-ID: <20210209175031.26422-1-jfehlig@suse.com> X-Originating-IP: [75.169.41.71] X-ClientProxiedBy: AM0PR07CA0005.eurprd07.prod.outlook.com (2603:10a6:208:ac::18) To AM8PR04MB7970.eurprd04.prod.outlook.com (2603:10a6:20b:24f::9) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6b042330-a85c-48a1-01aa-08d8cd233df9 X-MS-TrafficTypeDiagnostic: AM0PR04MB6066: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: 8YmIkDaPLPkykWKjeV3pfPrLinfPyr3NF547vZtTqzzw11rm726QmCBMjGuX9hByBErivSRR54nwI43pXiyQgzmzeL9RSSVq+GcUqyoSefWk/11dKQvpVjt3rfjXU4d+jOSYZz1nyuqd/CXEKCdiR137DzPeikwiXuwTso0Kzk1C66MyuBQrWfApgGA4of0DtVwnt9vY0pPZPtPEeJaNGrurs1fcdmOxul8DdHgeVyGCcSPQwR0bXsTDkhs9UpB/2RmjYkl7mudMkcfKKWocxq+/GMOAh69Zugn67ywRuIEE136BEjgxHxkI6qGV7Q3CJArqlzJbsy6iy4e6pURk5CRaAI3vXzMxhI8OI3n0nW4Nj2Mh3jDZPuYqptDIfWuMHpJypHIcVC8HFW0uknZRHRSUH6amFj6HZdav9mzdL8VoC9Sw+eIEkK9ZBlzyZdv1xEYtze8WI48kASCeecbuOyG977XxX7KtOD0qc/+ApR9ZgKyDP38sdXgxhKQ2gZwT1Raprx2y2D5sbAOkdOb5cA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM8PR04MB7970.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(346002)(366004)(136003)(39860400002)(376002)(396003)(2906002)(36756003)(6916009)(316002)(66946007)(8676002)(52116002)(7696005)(478600001)(66476007)(186003)(6486002)(956004)(66556008)(16526019)(26005)(2616005)(1076003)(6666004)(107886003)(4326008)(4744005)(5660300002)(8936002)(86362001)(83380400001); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?J9Tgu2RyaNKz7fPqMHtV5mTEysmxOlwZoebX5rtDT2PGUSCbA/vEE2b1+Y9U?= =?us-ascii?Q?n/aCXGQglI74zPytWfYKtVulqBtUPvIfvM/S8rLWUyKn90kElmbsx2ZVt9/j?= =?us-ascii?Q?YxJmW89+6QhCwXO4rr+zPR8Ufo6oX2i6mqLnxoEwL6pBIXZ/IycQ5rUU72d/?= =?us-ascii?Q?MnCnPGFxKTC6+aRaq64OzpfIg5Ooo0N47QHc9tNJkiIyTvHHN76QZfNnhGSk?= =?us-ascii?Q?58rKjvPDVoDFXSiywzwMocfrVa61AoCeFe36ggypPQhu60U0e3lxCmiBSDPL?= =?us-ascii?Q?QWcXOt8aYzLZn27PXXGn6Ays/sYa1QR9W1v7MTC1Sgm7zcwOsv74jfc3zG9b?= =?us-ascii?Q?i60V6MZjc3Zz32Ve01UsG+CxvHugFZIAsbZg6FcCH8WPncjRbU9gaZwHwPMb?= =?us-ascii?Q?xZ2IguX2xkiBg5FnHIZ6TKxLknee6ZzSIzCwUJJZTM/LUzti7y8wH241Do4c?= =?us-ascii?Q?Q7BW+FPB7z2yiUklJ+Urhr8JCZdnclYol3Wq29h2hFA32X+xJF0MCbuIlbIx?= =?us-ascii?Q?69jwPa/t5WGCDgiRUlX2/+LnnFmpd9y+mvzpSlNJeO7xDAwoYlGf/pq1yLNo?= =?us-ascii?Q?FBkmSVhaHKQOPuq4p1vTNF9+CFAA8qH/Z2HmBN2l12GoW8QoQo9xV45cnwzB?= =?us-ascii?Q?VvZyvpkvA+p/R0mqloaiaP6ZWa2+mk5AhozFsvJU48LOX4/3VcrdtvjsAWYy?= =?us-ascii?Q?s+n6DuZ34e2OyDebpek0/okJeDVtJ6uYZDtIh7mz28PlQvVdPX7Y9yDYMMrh?= =?us-ascii?Q?swLlriDaLQi1IFjvcofpXCFVxKzriNlENaTUGy+meKbJ6OBuAnthpFOZrMNR?= =?us-ascii?Q?7Rn2Ab5m26PFLOIfDGzwMJpW9wfDlwtdmRVjM0Q8GcuMq+4uX3Z7rh0rZjPc?= =?us-ascii?Q?IDmejsNVxbUzcXXFQQCSJ0R6FbdPnJlHmuVVgVAt9EelJuBVtP0nst5p9/gE?= =?us-ascii?Q?xruE7gUneOPmemB30XXOiJqSXXGy5K8UXgtjruOaZTcA9PNPe3hF3zK/b6YP?= =?us-ascii?Q?GmEzeL99SfjFDfkOI/g7zxrIETGKwYgtk1R00/5i7JLnlIdB1JSjdyySW686?= =?us-ascii?Q?1FjxMh2da2599If7JfLaHP/dsm+o0UGsB7leukgxmo8IdEZFTqKry1qD6/Lc?= =?us-ascii?Q?fc1prDISlw0PxzmEYLiVE8zyVkpeiEBDJ9GK5eidx6Z95mTwjyWi/KbfIpMP?= =?us-ascii?Q?4CwjzGltJGoCYyS7oArpy76oHPj8Sw+NBWNLF/rtOd/iG48Gk6PAxakcwPFf?= =?us-ascii?Q?APlSGc/fuHgqvCKqhYBXjQuWw182bB8CxVmCRLQbq9D0v8mvRSewOyvyCuZi?= =?us-ascii?Q?bGCAoLLl1ZDIaFJN1glWgqpj?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b042330-a85c-48a1-01aa-08d8cd233df9 X-MS-Exchange-CrossTenant-AuthSource: AM8PR04MB7970.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2021 17:50:52.4654 (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: OTdGSHxZtYgwVNfnBN84lo2HsvDRfIZkesZN1aP1JxR4xCY9onug+IjWJYB6y2E0lT1grQuM85+LDMSiOfvwOA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6066 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 2.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 119Hp1QP025673 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The various virtproxyd socket files are generated with invalid syntax, e.g. from virtproxyd.socket [Unit] Description=3DLibvirt proxy local socket Before=3Dvirtproxyd.service libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket libvirtd-tcp.socke= t libvirtd-tls.socket Note the missing 'Conflicts=3D' in the last line. Fix it by prepending 'Conflicts=3D' to libvirtd_socket_conflicts when adding virtproxyd to virt_daemon_units. Signed-off-by: Jim Fehlig Reviewed-by: Daniel P. Berrang=C3=A9 --- src/remote/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/meson.build b/src/remote/meson.build index 9ad2f6ab1c..0a188268b5 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -230,7 +230,7 @@ if conf.has('WITH_REMOTE') 'name': 'Libvirt proxy', 'sockprefix': 'libvirt', 'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ], - 'deps': libvirtd_socket_conflicts, + 'deps': 'Conflicts=3D' + libvirtd_socket_conflicts, } =20 openrc_init_files +=3D { --=20 2.29.2