From nobody Thu Apr 25 16:55:22 2024 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=1683047767; cv=none; d=zohomail.com; s=zohoarc; b=blH4IPNqpXgTnjy7cS5IAovS6guqSRGTPr/0Dz55SluImeUxbz/bDnSbgWd1jVE7E5harxAzO8MpiEIBOxJ380wCbBLSNT0KWLePlrjWcqlzeLPHGUDaHt9M+ZTxXYqRfcZnpYJ7Q6BieKsf0oNhl7PRV4sjunUJPh1lm/2m170= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683047767; 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=Havv6tFUOgsLcPftWL9ANG2HUGkhzKnb32kWcVNej5M=; b=YOC7DfgCI6H/bk2sdVqDgTC37HUMbcXKPNXTSzdvyIgGEW2vFt0WlIjSY+CfCwaSJgjKOWgodOts4ZSLWoFDbU1qvOndm68ov37BEOC11b5E43s90Tf9mAcD3S+tADHGS0rBZQ/Lfz+up2iDjkyxwrL6UY7uWTOZeizphwlVb3w= 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 1683047767099417.7407835281771; Tue, 2 May 2023 10:16:07 -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-195-4nOZ23A4PpeB-wwWALDljg-1; Tue, 02 May 2023 13:16:03 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1BFD5857FB9; Tue, 2 May 2023 17:15:58 +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 64F641121331; Tue, 2 May 2023 17:15:56 +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 D990419465A8; Tue, 2 May 2023 17:15:55 +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 34FE8194658C for ; Tue, 2 May 2023 17:15:55 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2951A2026E1C; Tue, 2 May 2023 17:15:55 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.224.51]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AE24A2026DFD for ; Tue, 2 May 2023 17:15:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683047766; 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=Havv6tFUOgsLcPftWL9ANG2HUGkhzKnb32kWcVNej5M=; b=MdKtZJjqpRNs/wv57g+FiSAqOFdRRic4AoSQppkomnL3nWwg96HY+q/BxG6dBSMo4ONIhN MTg9dS4zLmAu5FU+J6YN+BEUOH5dTOJaaOwrFigmoQkXS13th9KbL4VfY8RPzhTXJ/aMUf YeXeapKLOi//B4pcvViERaXn574ojJU= X-MC-Unique: 4nOZ23A4PpeB-wwWALDljg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 1/5] meson: Introduce initconfdir option Date: Tue, 2 May 2023 19:15:48 +0200 Message-Id: <20230502171552.25767-2-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.3 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: 1683047767450100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Right now we expect the configuration files for init scripts to live in /etc/sysconfig, but that location is only used by RHEL- and SUSE-derived distros. This means that packagers for other distros have to patch things as part of the build process, while people building from source will get wonky integration. This new option will provide a convenient way to override the default location at build time that is usable by distro packagers and people building from source alike. Signed-off-by: Andrea Bolognani Reviewed-by: Martin Kletzander --- meson.build | 5 +++++ meson_options.txt | 1 + 2 files changed, 6 insertions(+) diff --git a/meson.build b/meson.build index bad13c0c9d..8da987b1cb 100644 --- a/meson.build +++ b/meson.build @@ -76,6 +76,11 @@ if runstatedir =3D=3D '' runstatedir =3D localstatedir / 'run' endif =20 +initconfdir =3D get_option('initconfdir') +if initconfdir =3D=3D '' + initconfdir =3D sysconfdir / 'sysconfig' +endif + bindir =3D prefix / get_option('bindir') datadir =3D prefix / get_option('datadir') includedir =3D prefix / get_option('includedir') diff --git a/meson_options.txt b/meson_options.txt index 861c5577d2..9174c4021c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -3,6 +3,7 @@ option('packager', type: 'string', value: '', description: = 'Extra packager name' option('packager_version', type: 'string', value: '', description: 'Extra = packager version') option('system', type: 'boolean', value: false, description: 'Set install = paths to system ones') option('runstatedir', type: 'string', value: '', description: 'State direc= tory for temporary sockets, pid files, etc') +option('initconfdir', type: 'string', value: '', description: 'directory f= or init script configuration files') option('expensive_tests', type: 'feature', value: 'auto', description: 'se= t the default for enabling expensive tests (long timeouts)') option('test_coverage', type: 'boolean', value: false, description: 'turn = on code coverage instrumentation') option('git_werror', type: 'feature', value: 'auto', description: 'use -We= rror if building from GIT') --=20 2.40.1 From nobody Thu Apr 25 16:55:22 2024 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=1683047766; cv=none; d=zohomail.com; s=zohoarc; b=ix9VukH2KlvMn4YHmxVE1To4LZnBuCtH836cCKhg1FzuULK+7U5di3XY6XVX69A0o7Awg+2kbeyUYMwaxBPFDHntSlKXH/5xGML8nzIa9mF5AXJOcDbhn6PDielIP0IYE8S5kBpjn+giPWEDJhcC8XTyrmhSqmpP2bI1wt9SQAo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683047766; 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=Tua+CjROG0YZO5O4GNRHjScEAwxZ7vqcRmRzGFDrGXM=; b=IAJmMaONSPniYUFA9UT5exXx2ZTv4In6mXwgW/PejMLcBUK8XQBSm2ujTU7z+qzBaUg8UNyjK2jDOEsat0eOcyPSeUZi/JI5Jf5d0PFQrXSpOvuSzjo9e9tiJDDnusdbbaoG5O4sGAjqgIm7mca2RmeZZdcOKbdExd3dYVxY18Y= 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 1683047766120743.9516217848161; Tue, 2 May 2023 10:16:06 -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-195-ISPuGXm6P5KJPKgp-dHFmg-1; Tue, 02 May 2023 13:16:03 -0400 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 1DA1E811E7E; Tue, 2 May 2023 17:15:58 +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 887B540C2009; Tue, 2 May 2023 17:15:57 +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 139DA19465A0; Tue, 2 May 2023 17:15:57 +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 298AB1946A48 for ; Tue, 2 May 2023 17:15:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0CDD12026D25; Tue, 2 May 2023 17:15:56 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.224.51]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6EA582026D16 for ; Tue, 2 May 2023 17:15:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683047765; 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=Tua+CjROG0YZO5O4GNRHjScEAwxZ7vqcRmRzGFDrGXM=; b=YeDtwVfDVE8WMsteJqG668nrsUbp+Eff9e0h6ovK01HUIjCQX3OSGp/Js6Sat6l/FIVtAe m5KO7WMI0RN/TwwU1SjHXbM8HuIvylkTNFsN/eHV32DCcvPs4drtTYX8Mwu++NHaGt+STW /FLkCDAN0nlrwxBlrFMpudNeCKysK5k= X-MC-Unique: ISPuGXm6P5KJPKgp-dHFmg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 2/5] meson: Use initconfdir Date: Tue, 2 May 2023 19:15:49 +0200 Message-Id: <20230502171552.25767-3-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.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: 1683047766850100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani Reviewed-by: Martin Kletzander --- docs/manpages/libvirt-guests.rst | 2 +- docs/manpages/meson.build | 1 + src/ch/virtchd.service.in | 2 +- src/interface/virtinterfaced.service.in | 2 +- src/libxl/virtxend.service.in | 2 +- src/locking/virtlockd.service.in | 2 +- src/logging/virtlogd.service.in | 2 +- src/lxc/virtlxcd.service.in | 2 +- src/meson.build | 1 + src/network/virtnetworkd.service.in | 2 +- src/node_device/virtnodedevd.service.in | 2 +- src/nwfilter/virtnwfilterd.service.in | 2 +- src/qemu/virtqemud.service.in | 2 +- src/remote/libvirtd.service.in | 2 +- src/remote/virtproxyd.service.in | 2 +- src/secret/virtsecretd.service.in | 2 +- src/storage/virtstoraged.service.in | 2 +- src/vbox/virtvboxd.service.in | 2 +- src/vz/virtvzd.service.in | 2 +- tools/libvirt-guests.service.in | 2 +- tools/libvirt-guests.sh.in | 5 +++-- tools/meson.build | 1 + tools/virt-pki-validate.in | 13 +++++++------ 23 files changed, 31 insertions(+), 26 deletions(-) diff --git a/docs/manpages/libvirt-guests.rst b/docs/manpages/libvirt-guest= s.rst index bea08e3bff..f27eaad6e4 100644 --- a/docs/manpages/libvirt-guests.rst +++ b/docs/manpages/libvirt-guests.rst @@ -42,7 +42,7 @@ FILES ``libvirt-guests`` defines several variables to control service behavior. The default value of these variables can be overridden in: =20 -* ``@SYSCONFDIR@/sysconfig/libvirt-guests`` +* ``@INITCONFDIR@/libvirt-guests`` =20 The following variables are supported: =20 diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build index afcadaefbd..bdc17011a8 100644 --- a/docs/manpages/meson.build +++ b/docs/manpages/meson.build @@ -88,6 +88,7 @@ endforeach docs_man_conf =3D configuration_data({ 'SYSCONFDIR': sysconfdir, 'RUNSTATEDIR': runstatedir, + 'INITCONFDIR': initconfdir, 'VERSION': meson.project_version(), }) =20 diff --git a/src/ch/virtchd.service.in b/src/ch/virtchd.service.in index 8c22b02c9e..a07c04a845 100644 --- a/src/ch/virtchd.service.in +++ b/src/ch/virtchd.service.in @@ -18,7 +18,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify Environment=3DVIRTCHD_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@sysconfdir@/sysconfig/virtchd +EnvironmentFile=3D-@initconfdir@/virtchd ExecStart=3D@sbindir@/virtchd $VIRTCHD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID KillMode=3Dprocess diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtin= terfaced.service.in index cb860ff1c4..1be3ab32dc 100644 --- a/src/interface/virtinterfaced.service.in +++ b/src/interface/virtinterfaced.service.in @@ -14,7 +14,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify Environment=3DVIRTINTERFACED_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@sysconfdir@/sysconfig/virtinterfaced +EnvironmentFile=3D-@initconfdir@/virtinterfaced ExecStart=3D@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in index 9171d4fdf8..abb1972777 100644 --- a/src/libxl/virtxend.service.in +++ b/src/libxl/virtxend.service.in @@ -19,7 +19,7 @@ ConditionPathExists=3D/proc/xen/capabilities [Service] Type=3Dnotify Environment=3DVIRTXEND_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@sysconfdir@/sysconfig/virtxend +EnvironmentFile=3D-@initconfdir@/virtxend ExecStart=3D@sbindir@/virtxend $VIRTXEND_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.servi= ce.in index 19271d1e7d..23054369d5 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -8,7 +8,7 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Environment=3DVIRTLOCKD_ARGS=3D -EnvironmentFile=3D-@sysconfdir@/sysconfig/virtlockd +EnvironmentFile=3D-@initconfdir@/virtlockd ExecStart=3D@sbindir@/virtlockd $VIRTLOCKD_ARGS ExecReload=3D/bin/kill -USR1 $MAINPID # Losing the locks is a really bad thing that will diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service= .in index 8ab5478517..158124e4d3 100644 --- a/src/logging/virtlogd.service.in +++ b/src/logging/virtlogd.service.in @@ -7,7 +7,7 @@ Documentation=3Dman:virtlogd(8) Documentation=3Dhttps://libvirt.org =20 [Service] -EnvironmentFile=3D-@sysconfdir@/sysconfig/virtlogd +EnvironmentFile=3D-@initconfdir@/virtlogd ExecStart=3D@sbindir@/virtlogd $VIRTLOGD_ARGS ExecReload=3D/bin/kill -USR1 $MAINPID # Losing the logs is a really bad thing that will diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in index 9946db9462..2623f7375a 100644 --- a/src/lxc/virtlxcd.service.in +++ b/src/lxc/virtlxcd.service.in @@ -18,7 +18,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify Environment=3DVIRTLXCD_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@sysconfdir@/sysconfig/virtlxcd +EnvironmentFile=3D-@initconfdir@/virtlxcd ExecStart=3D@sbindir@/virtlxcd $VIRTLXCD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID KillMode=3Dprocess diff --git a/src/meson.build b/src/meson.build index ad7796f03d..c2b882d464 100644 --- a/src/meson.build +++ b/src/meson.build @@ -808,6 +808,7 @@ if conf.has('WITH_LIBVIRTD') 'runstatedir': runstatedir, 'sbindir': sbindir, 'sysconfdir': sysconfdir, + 'initconfdir': initconfdir, 'name': unit['name'], 'service': unit['service'], 'sockprefix': unit['sockprefix'], diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd= .service.in index 05ce672b73..48423e777d 100644 --- a/src/network/virtnetworkd.service.in +++ b/src/network/virtnetworkd.service.in @@ -17,7 +17,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify Environment=3DVIRTNETWORKD_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@sysconfdir@/sysconfig/virtnetworkd +EnvironmentFile=3D-@initconfdir@/virtnetworkd ExecStart=3D@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure diff --git a/src/node_device/virtnodedevd.service.in b/src/node_device/virt= nodedevd.service.in index cd9de362fd..3ceed30f29 100644 --- a/src/node_device/virtnodedevd.service.in +++ b/src/node_device/virtnodedevd.service.in @@ -14,7 +14,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify Environment=3DVIRTNODEDEVD_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@sysconfdir@/sysconfig/virtnodedevd +EnvironmentFile=3D-@initconfdir@/virtnodedevd ExecStart=3D@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure diff --git a/src/nwfilter/virtnwfilterd.service.in b/src/nwfilter/virtnwfil= terd.service.in index ab65419e0c..37fa54d684 100644 --- a/src/nwfilter/virtnwfilterd.service.in +++ b/src/nwfilter/virtnwfilterd.service.in @@ -14,7 +14,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify Environment=3DVIRTNWFILTERD_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@sysconfdir@/sysconfig/virtnwfilterd +EnvironmentFile=3D-@initconfdir@/virtnwfilterd ExecStart=3D@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in index 315359e287..032cbcbbf0 100644 --- a/src/qemu/virtqemud.service.in +++ b/src/qemu/virtqemud.service.in @@ -20,7 +20,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify Environment=3DVIRTQEMUD_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@sysconfdir@/sysconfig/virtqemud +EnvironmentFile=3D-@initconfdir@/virtqemud ExecStart=3D@sbindir@/virtqemud $VIRTQEMUD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID KillMode=3Dprocess diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in index 30588279f8..11507207a1 100644 --- a/src/remote/libvirtd.service.in +++ b/src/remote/libvirtd.service.in @@ -28,7 +28,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify Environment=3DLIBVIRTD_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@sysconfdir@/sysconfig/libvirtd +EnvironmentFile=3D-@initconfdir@/libvirtd ExecStart=3D@sbindir@/libvirtd $LIBVIRTD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID KillMode=3Dprocess diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.servi= ce.in index f9bb6b84a9..dd3bdf3429 100644 --- a/src/remote/virtproxyd.service.in +++ b/src/remote/virtproxyd.service.in @@ -14,7 +14,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify Environment=3DVIRTPROXYD_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@sysconfdir@/sysconfig/virtproxyd +EnvironmentFile=3D-@initconfdir@/virtproxyd ExecStart=3D@sbindir@/virtproxyd $VIRTPROXYD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure diff --git a/src/secret/virtsecretd.service.in b/src/secret/virtsecretd.ser= vice.in index 6d298c5334..774cfc3ecd 100644 --- a/src/secret/virtsecretd.service.in +++ b/src/secret/virtsecretd.service.in @@ -14,7 +14,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify Environment=3DVIRTSECRETD_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@sysconfdir@/sysconfig/virtsecretd +EnvironmentFile=3D-@initconfdir@/virtsecretd ExecStart=3D@sbindir@/virtsecretd $VIRTSECRETD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged= .service.in index eda4d86d37..e1a1ea6820 100644 --- a/src/storage/virtstoraged.service.in +++ b/src/storage/virtstoraged.service.in @@ -16,7 +16,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify Environment=3DVIRTSTORAGED_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@sysconfdir@/sysconfig/virtstoraged +EnvironmentFile=3D-@initconfdir@/virtstoraged ExecStart=3D@sbindir@/virtstoraged $VIRTSTORAGED_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure diff --git a/src/vbox/virtvboxd.service.in b/src/vbox/virtvboxd.service.in index 6f447276e9..e73206591a 100644 --- a/src/vbox/virtvboxd.service.in +++ b/src/vbox/virtvboxd.service.in @@ -15,7 +15,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify Environment=3DVIRTVBOXD_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@sysconfdir@/sysconfig/virtvboxd +EnvironmentFile=3D-@initconfdir@/virtvboxd ExecStart=3D@sbindir@/virtvboxd $VIRTVBOXD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure diff --git a/src/vz/virtvzd.service.in b/src/vz/virtvzd.service.in index 2b1165c92b..bd98d96262 100644 --- a/src/vz/virtvzd.service.in +++ b/src/vz/virtvzd.service.in @@ -15,7 +15,7 @@ Documentation=3Dhttps://libvirt.org [Service] Type=3Dnotify Environment=3DVIRTVZD_ARGS=3D"--timeout 120" -EnvironmentFile=3D-@sysconfdir@/sysconfig/virtvzd +EnvironmentFile=3D-@initconfdir@/virtvzd ExecStart=3D@sbindir@/virtvzd $VIRTVZD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID Restart=3Don-failure diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service= .in index 1c569c320d..c547218f2a 100644 --- a/tools/libvirt-guests.service.in +++ b/tools/libvirt-guests.service.in @@ -14,7 +14,7 @@ Documentation=3Dman:libvirt-guests(8) Documentation=3Dhttps://libvirt.org =20 [Service] -EnvironmentFile=3D-@sysconfdir@/sysconfig/libvirt-guests +EnvironmentFile=3D-@initconfdir@/libvirt-guests # Hack just call traditional service until we factor # out the code ExecStart=3D@libexecdir@/libvirt-guests.sh start diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index 87f96af14d..016014215f 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -18,6 +18,7 @@ =20 sysconfdir=3D"@sysconfdir@" localstatedir=3D"@localstatedir@" +initconfdir=3D"@initconfdir@" libvirtd=3D"@sbindir@"/libvirtd =20 # Source function library. @@ -39,8 +40,8 @@ START_DELAY=3D0 BYPASS_CACHE=3D0 SYNC_TIME=3D0 =20 -test -f "$sysconfdir"/sysconfig/libvirt-guests && - . "$sysconfdir"/sysconfig/libvirt-guests +test -f "$initconfdir"/libvirt-guests && + . "$initconfdir"/libvirt-guests =20 LISTFILE=3D"$localstatedir"/lib/libvirt/libvirt-guests VAR_SUBSYS_LIBVIRT_GUESTS=3D"$localstatedir"/lock/subsys/libvirt-guests diff --git a/tools/meson.build b/tools/meson.build index fad7f202ad..f2d58cfdcb 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -241,6 +241,7 @@ tools_conf =3D configuration_data({ 'sbindir': sbindir, 'schemadir': pkgdatadir / 'schemas', 'sysconfdir': sysconfdir, + 'initconfdir': initconfdir, }) =20 configure_file( diff --git a/tools/virt-pki-validate.in b/tools/virt-pki-validate.in index 7100eafb63..c91f247ba5 100644 --- a/tools/virt-pki-validate.in +++ b/tools/virt-pki-validate.in @@ -73,6 +73,7 @@ echo Found "$CERTOOL" # SYSCONFDIR=3D"@sysconfdir@" PKI=3D"$SYSCONFDIR/pki" +INITCONFDIR=3D"@initconfdir@" if [ ! -d "$PKI" ] then echo the $PKI directory is missing, it is usually @@ -294,24 +295,24 @@ fi =20 if [ "$SERVER" =3D "1" ] then - if [ -r "$SYSCONFDIR"/sysconfig/libvirtd ] + if [ -r "$INITCONFDIR"/libvirtd ] then - if grep "^LIBVIRTD_ARGS.*--listen" "$SYSCONFDIR"/sysconfig/libvirt= d \ + if grep "^LIBVIRTD_ARGS.*--listen" "$INITCONFDIR"/libvirtd \ >/dev/null 2>&1 then : else - echo Make sure "$SYSCONFDIR"/sysconfig/libvirtd is setup to li= sten to + echo Make sure "$INITCONFDIR"/libvirtd is setup to listen to echo TCP/IP connections and restart the libvirtd service fi fi - if [ -r "$SYSCONFDIR"/sysconfig/iptables ] + if [ -r "$INITCONFDIR"/iptables ] then - if grep "$PORT" "$SYSCONFDIR"/sysconfig/iptables >/dev/null 2>&1 + if grep "$PORT" "$INITCONFDIR"/iptables >/dev/null 2>&1 then : else - echo Make sure "$SYSCONFDIR"/sysconfig/iptables is setup to al= low + echo Make sure "$INITCONFDIR"/iptables is setup to allow echo incoming TCP/IP connections on port $PORT and echo restart the iptables service fi --=20 2.40.1 From nobody Thu Apr 25 16:55:22 2024 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=1683047771; cv=none; d=zohomail.com; s=zohoarc; b=nPvEZv4S/Vymzyj5Gv2vAo8VkUKEWmA+Aw0zfoC0Ndt1VYejPcPJcOgATckjMwfReOPluCSl86OcwezfbpRrMdJw8F5MPq7JILTcsbvjELYHm4Q/p+B5KymVxc3DLfKhUEN6su6hkkQBXokkbp2ScDfuMXpOO5/bSXur+MgAbKI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683047771; 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=HBLAl7a8wCOnmNpbPKvbJtdGwB+v8HwBQz+hnvJXjKc=; b=QfmuNeJZQRptPmk9vB2x8/gyWDRnI77Ob28dr6Ys10sbEiz6XK0yTkFhH68yEiVibbX4lfOTppK+8oax7BDibgRU206u4hutcaucLky5Ro7cEtyp5R2toz9/TmGFuPRhj3M8ZXCcFRV9jDq/nMxbvUA+mtpU9Vj5zdPkdmlTwwQ= 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 1683047771305711.0558931685063; Tue, 2 May 2023 10:16:11 -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-287-UlH1yuLaN_KogyYLvj-BaA-1; Tue, 02 May 2023 13:16:05 -0400 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 536E7106D1C8; 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 417EA40C2009; 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 211421946595; 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 CD987194658C for ; Tue, 2 May 2023 17:15:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id BFE272026D3C; Tue, 2 May 2023 17:15:56 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.224.51]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 518832026D16 for ; Tue, 2 May 2023 17:15:56 +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=HBLAl7a8wCOnmNpbPKvbJtdGwB+v8HwBQz+hnvJXjKc=; b=S8Agq0mXf5aPyoLAfOE02m4cnO+Vd0teN/XTvTro9N6Qrz7cdZPqo3cjzSNzwiKd1jFlpT V/UBkliJQBDpLzyGTVwqALUv9crddSflh6U5UgiA2n41FHgentCnjbLhAWbK0O0lrItj5n mGbwoh/TIVdmT5SXbFuexc3aMJeeKl4= X-MC-Unique: UlH1yuLaN_KogyYLvj-BaA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 3/5] rpm: Set initconfdir explicitly Date: Tue, 2 May 2023 19:15:50 +0200 Message-Id: <20230502171552.25767-4-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.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: 1683047773494100007 Content-Type: text/plain; charset="utf-8"; x-default="true" The default would already work fine for Fedora and RHEL, but it's better to be explicit. Signed-off-by: Andrea Bolognani Reviewed-by: Martin Kletzander --- libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index dae9c87aa4..c542ec3b2b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1213,6 +1213,7 @@ export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_= specdir}/libvirt.spec) =20 %meson \ -Drunstatedir=3D%{_rundir} \ + -Dinitconfdir=3D%{_sysconfdir}/sysconfig \ %{?arg_qemu} \ %{?arg_openvz} \ %{?arg_lxc} \ --=20 2.40.1 From nobody Thu Apr 25 16:55:22 2024 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=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=HC8Vw83+eKTUXIoTp3HQ9+siNTAT6NhIcP54WDI2jPFdvMDDX1sq0Y+IkGcQgMtGh8OSip2zcAgc4kPHlYy3tRk89RMxyVCQhdHhMkTNN83444N38Ni3FM9rMOpxfeXJagMdhnlKXCmxjwJE6+9LTKItnqatgZht2GQtHB8szDo= 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=mtjBfPYoPIwJzSzlpUhGT8bWol75gLkzE2V+7BQ2jbo=; b=MImELO7HMi0s6ACemnY+2pkhBVyJ5MYyMLzJuxkg+Gy9zS3ZhnS5d0hnBIZlLwVDM1QnAg3MycDW8Vi0ruCs3olSzsd4YEhObdPV9ZEel5tYRj1zS4EvGRsSAXo3FcIYLidKLvtwLIM0B1ieN9sedTFgL/PB8UruvNn1tuLNHJU= 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=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.133.124]) by mx.zohomail.com with SMTPS id 1683047770327601.2273712249594; 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-515-m16n1vT9MBazpMP_d4uPKQ-1; Tue, 02 May 2023 13:16:03 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7880D884EC1; Tue, 2 May 2023 17:15:58 +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 631431120ABB; Tue, 2 May 2023 17:15:58 +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 4718D1946595; Tue, 2 May 2023 17:15:58 +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 8B1EA19465B7 for ; Tue, 2 May 2023 17:15:57 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 804C92029F9A; Tue, 2 May 2023 17:15:57 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.224.51]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 10F442024CDC for ; Tue, 2 May 2023 17:15:56 +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=mtjBfPYoPIwJzSzlpUhGT8bWol75gLkzE2V+7BQ2jbo=; b=SSXbqc20WqSPhH9gtPIZE8itBP0mRGYmoGIxlxJSGlJg4rORrfIwUmNxVV8xOxkNEL9GQx tAZ3RBvh05awPOJWZU57+a3vNcGx1Cl8PJdZQVQEfSTW6VYfW0Wevey5W4WgDiY7a1zzBC 16qTV795DcWJPmjZLI9ffx/dNj+RZPE= X-MC-Unique: m16n1vT9MBazpMP_d4uPKQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 4/5] meson: Move definition of os_release Date: Tue, 2 May 2023 19:15:51 +0200 Message-Id: <20230502171552.25767-5-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.3 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: 1683047771434100003 Content-Type: text/plain; charset="utf-8"; x-default="true" We're about to introduce another user of the value in a different scope. Signed-off-by: Andrea Bolognani Reviewed-by: Martin Kletzander --- meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 8da987b1cb..8848e58995 100644 --- a/meson.build +++ b/meson.build @@ -24,6 +24,11 @@ if git and not get_option('no_git') endif =20 =20 +# detect operating system + +os_release =3D run_command('grep', '-E', '^ID(_LIKE)*=3D', '/etc/os-releas= e', check: false).stdout() + + # prepare build configuration data =20 conf =3D configuration_data() @@ -1618,7 +1623,6 @@ if not get_option('driver_qemu').disabled() qemu_user =3D 'root' qemu_group =3D 'wheel' else - os_release =3D run_command('grep', '-E', '^ID(_LIKE)*=3D', '/etc/o= s-release', check: false).stdout() if os_release.contains('arch') qemu_user =3D 'nobody' qemu_group =3D 'nobody' --=20 2.40.1 From nobody Thu Apr 25 16:55:22 2024 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