From nobody Wed Apr 2 06:48:46 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551847938356413.3021989686746; Tue, 5 Mar 2019 20:52:18 -0800 (PST) Received: from localhost ([127.0.0.1]:54313 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1OXP-0001W7-Dt for importer@patchew.org; Tue, 05 Mar 2019 23:52:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1OV3-0000Fc-6x for qemu-devel@nongnu.org; Tue, 05 Mar 2019 23:49:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1OV2-0003ya-IY for qemu-devel@nongnu.org; Tue, 05 Mar 2019 23:49:49 -0500 Received: from smtp.lg.ehu.es ([158.227.0.66]:58426 helo=smtp.ehu.eus) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1OV2-0003y7-63 for qemu-devel@nongnu.org; Tue, 05 Mar 2019 23:49:48 -0500 Received: from imsva2.lgp.ehu.es (imsva2.lgp.ehu.es [10.0.3.246]) by postfix.smtp2.imsva2 (Postfix) with ESMTPS id 41F642D3D; Wed, 6 Mar 2019 05:49:47 +0100 (CET) Received: from imsva2.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 17E865A054; Wed, 6 Mar 2019 05:49:47 +0100 (CET) Received: from imsva2.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0B1285A053; Wed, 6 Mar 2019 05:49:47 +0100 (CET) Received: from smtp.ehu.eus (unknown [10.0.100.76]) by imsva2.lgp.ehu.es (Postfix) with ESMTPS; Wed, 6 Mar 2019 05:49:47 +0100 (CET) Received: from 03612eec87fc (unknown [139.47.78.33]) by smtp2 (Postfix) with ESMTPSA id B7E0F2D3D; Wed, 6 Mar 2019 05:49:46 +0100 (CET) Date: Wed, 6 Mar 2019 04:49:47 +0000 From: Unai Martinez-Corral To: qemu-devel@nongnu.org Message-ID: <20190306044947.GE75@03612eec87fc> References: <20190306031221.GA53@03612eec87fc> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190306031221.GA53@03612eec87fc> User-Agent: Mutt/1.11.2 (2019-01-07) X-Greylist: ACL 174 matched, not delayed by milter-greylist-4.4.3 (smtp2); Wed, 06 Mar 2019 05:49:46 +0100 (CET) X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSVA-9.1.0.1631-8.2.0.1013-24472.004 X-TM-AS-Result: No--0.464-7.0-31-10 X-imss-scan-details: No--0.464-7.0-31-10 X-TMASE-Version: IMSVA-9.1.0.1631-8.2.1013-24472.004 X-TMASE-Result: 10--0.464400-10.000000 X-TMASE-MatchedRID: ntF4Soh351A8mRT0SYY6fo6MisxJraxHTJDl9FKHbrlcKZwALwMGs9ro EGQiudNyFULLkuLAIHN1F2UJ40Hu5gzyMxeMEX6w/sToY2qzpx5eu6llOoM7BnnDQRq5CiZH9xS 3mVzWUuAojN1lLei7RTkZpB/sBFJfYq9UOOBbeeSzJaUU4faXupxfENmSZIT/QGUGnItpMgkCH0 qBR+l0bOMIUT9TMJXJLEsMkTy4azpc8aHbI53jA+mfp9Bphh8GYRlfAbNtCxYs54z/I19gOVNoe JYJ3Pr6 X-TMASE-SNAP-Result: 1.821001.0001-0-1-12:0,22:0,33:0,34:0-0 X-Greylist: Sender IP whitelisted, Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (postfix.smtp2.imsva2); Wed, 06 Mar 2019 05:49:47 +0100 (CET) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 158.227.0.66 Subject: [Qemu-devel] [PATCH v3 5/10] qemu-binfmt-conf.sh: honour QEMU_PATH and/or QEMU_SUFFIX X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: riku.voipio@iki.fi, laurent@vivier.eu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Allow to set 'path' or 'suffix' through environment variables, consistently with 'persistent' and 'credential'. Signed-off-by: Unai Martinez-Corral --- scripts/qemu-binfmt-conf.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index 68aa4c3f78..c113ff131e 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -176,6 +176,7 @@ Usage: qemu-binfmt-conf.sh [--path PATH][--debian][--sy= stemd CPU] --help: display this usage --path: set path to qemu interpreter ($QEMU_PATH) --suffix: add a suffix to the default interpreter name + ($QEMU_SUFFIX) --debian: don't write into /proc, instead generate update-binfmts templates --systemd: don't write into /proc, @@ -321,13 +322,11 @@ BINFMT_SET=3Dqemu_register_interpreter SYSTEMDDIR=3D"/etc/binfmt.d" DEBIANDIR=3D"/usr/share/binfmts" -QEMU_PATH=3D/usr/local/bin - +QEMU_PATH=3D"${QEMU_PATH:-/usr/local/bin}" +QEMU_SUFFIX=3D"${QEMU_SUFFIX:-}" QEMU_CREDENTIAL=3D"${QEMU_CREDENTIAL:-no}" QEMU_PERSISTENT=3D"${QEMU_PERSISTENT:-no}" -QEMU_SUFFIX=3D"" - options=3D$(getopt -o ds:Q:S:e:hcp -l debian,systemd:,path:,suffix:,export= dir:,help,credential,persistent -- "$@") eval set -- "$options" -- 2.20.1