From nobody Wed Apr 2 07:02:48 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 155230176138613.205411533416964; Mon, 11 Mar 2019 03:56:01 -0700 (PDT) Received: from localhost ([127.0.0.1]:59531 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3Ib8-0003pn-Bt for importer@patchew.org; Mon, 11 Mar 2019 06:55:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36508) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3IBo-0007t1-9e for qemu-devel@nongnu.org; Mon, 11 Mar 2019 06:29:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3IBj-00012v-Ic for qemu-devel@nongnu.org; Mon, 11 Mar 2019 06:29:48 -0400 Received: from smtp.lg.ehu.es ([158.227.0.66]:42193 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 1h3IBj-00012N-3m for qemu-devel@nongnu.org; Mon, 11 Mar 2019 06:29:43 -0400 Received: from imsva1.lgp.ehu.es (imsva1.lgp.ehu.es [10.0.3.245]) by postfix.smtp1.imsva1 (Postfix) with ESMTPS id 5B0D93F8D0; Mon, 11 Mar 2019 11:29:41 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 249B211004A; Mon, 11 Mar 2019 11:29:41 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 187DD110045; Mon, 11 Mar 2019 11:29:41 +0100 (CET) Received: from smtp.ehu.eus (unknown [10.0.100.73]) by imsva1.lgp.ehu.es (Postfix) with ESMTPS; Mon, 11 Mar 2019 11:29:41 +0100 (CET) Received: from 765644dd90e5 (unknown [139.47.78.33]) by smtp1 (Postfix) with ESMTPSA id CAB313F8D0; Mon, 11 Mar 2019 11:29:40 +0100 (CET) Date: Mon, 11 Mar 2019 10:29:42 +0000 From: Unai Martinez-Corral To: qemu-devel@nongnu.org Message-ID: <20190311102942.GE16@765644dd90e5> References: <20190311101428.GA11@765644dd90e5> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190311101428.GA11@765644dd90e5> User-Agent: Mutt/1.11.2 (2019-01-07) X-Greylist: ACL 177 matched, not delayed by milter-greylist-4.4.3 (smtp1); Mon, 11 Mar 2019 11:29:41 +0100 (CET) X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSVA-9.1.0.1631-8.2.0.1013-24482.007 X-TM-AS-Result: No--0.599-7.0-31-10 X-imss-scan-details: No--0.599-7.0-31-10 X-TMASE-Version: IMSVA-9.1.0.1631-8.2.1013-24482.007 X-TMASE-Result: 10--0.598900-10.000000 X-TMASE-MatchedRID: wjdoQEOKyrY8mRT0SYY6fo6MisxJraxHTJDl9FKHbrkOAHqXajwVGLh0 OUlkSqv98/nBmhGQ+G6/keBZOvHAsTvsSwE6Lz76ydRP56yRRA99LQinZ4QefHUIH+25YvS80+i QwApCn9sD+c09Hd/d3MZW5ai5WKlyDl0VN9oaBDlKnZA/IKbI90w2Xy7qeFgB2FfuaVY12UVEuY H2lOWVlPkiL0dxx+ssCpgDvhqwl9JWAYkIdEDEp8+URU5VEeHpzB2k3gHGTljd1q4RlEnwvE0Yg 3c8gM5jSxeH8a3WdLPfsnwfcTQdxA== 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.smtp1.imsva1); Mon, 11 Mar 2019 11:29:41 +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 v4 6/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 Reviewed-by: Laurent Vivier --- scripts/qemu-binfmt-conf.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index 0918f7fba6..13e619794c 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -177,7 +177,7 @@ Options and associated environment variables: Argument Env-variable Description -h|--help display this usage -Q|--path PATH: QEMU_PATH set path to qemu interpreter(s) --F|--suffix SUFFIX: add a suffix to the default interpre= ter name +-F|--suffix SUFFIX: QEMU_SUFFIX add a suffix to the default interpre= ter name -d|--debian: don't write into /proc, generate upd= ate-binfmts templates -s|--systemd CPU: don't write into /proc, generate fil= e for systemd-binfmt.service for the given= CPU; if CPU is "ALL", @@ -318,13 +318,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.21.0