From nobody Thu Dec 18 22:24:51 2025 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=1683047770; cv=none; d=zohomail.com; s=zohoarc; b=fHImd638j3fOPgLAWhhzQ4/Pho1TzfdHcdkU9q9tnOPTi8D3hM+MVEStFgquTp1MPYWPM6NptYxUsVrNv1M4RMEhuYTYQJu2ETYht3bqDEDvAGfLQm+2tnlnHRuQLEadvpxzjyy7u0fd24bM9P3E+6hWt87s/JCXjctUxleRQCg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683047770; 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=9m8RQ65rRMV5novGUnT2YaFULDgDR5NTbXPknEyMxpE=; b=HUROvCaxErGDiHZi57aU2t8Ekd40IHGW7I5VCq3UnUjtj49S7evCYfnu4PyoZJJ+i/KZ2b6413pbAF80PRV8XBd67F/njmU/5C0u4BqBgA6H1Cz3h1TJZ3iJ+9yJX7i8m/+VjIjK9EDRsZWnePUp5CB1y9ihOx3QJ5TbzXGkmV8= 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 1683047770256505.6939502412408; Tue, 2 May 2023 10:16:10 -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-351-xZKpLGBbOkW9L0SExKbM6w-1; Tue, 02 May 2023 13:16:05 -0400 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 C3F30855300; Tue, 2 May 2023 17:15:59 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA18C2024CDF; Tue, 2 May 2023 17:15:59 +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 551681946A41; Tue, 2 May 2023 17:15:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 54B5319465A8 for ; Tue, 2 May 2023 17:15:58 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4644C20239E7; Tue, 2 May 2023 17:15:58 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.224.51]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C5F6E20239E2 for ; Tue, 2 May 2023 17:15:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683047769; 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=9m8RQ65rRMV5novGUnT2YaFULDgDR5NTbXPknEyMxpE=; b=FPxYYRf46SjzP2ZkoZXRTLV/SrREzbswZFQeKPYNTZ6eEUC5IbWr9DuWXvU3Gk8ZNgHybs qlluKKO0S6UrVm0cNqLzixbZqsyT2uLKK+TAj8v0zMq/tWrLcrkkXfiFM3giPyXYGTbEvm gQbDRjVRWpgIdsdIMP7SBoTY2zSalPY= X-MC-Unique: xZKpLGBbOkW9L0SExKbM6w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 5/5] meson: Improve initconfdir defaults Date: Tue, 2 May 2023 19:15:52 +0200 Message-Id: <20230502171552.25767-6-abologna@redhat.com> In-Reply-To: <20230502171552.25767-1-abologna@redhat.com> References: <20230502171552.25767-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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: 1683047771436100004 Content-Type: text/plain; charset="utf-8"; x-default="true" Keep /etc/sysconfig as the fallback, but pick more suitable values for various Linux distros. Signed-off-by: Andrea Bolognani Reviewed-by: Martin Kletzander --- meson.build | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 8848e58995..f04703b810 100644 --- a/meson.build +++ b/meson.build @@ -83,7 +83,16 @@ endif =20 initconfdir =3D get_option('initconfdir') if initconfdir =3D=3D '' - initconfdir =3D sysconfdir / 'sysconfig' + if (os_release.contains('alpine') or + os_release.contains('arch') or + os_release.contains('gentoo')) + initconfdir =3D sysconfdir / 'conf.d' + # Ubuntu has ID_LIKE=3Ddebian + elif os_release.contains('debian') + initconfdir =3D sysconfdir / 'default' + else + initconfdir =3D sysconfdir / 'sysconfig' + endif endif =20 bindir =3D prefix / get_option('bindir') --=20 2.40.1