From nobody Wed Apr 2 06:47:23 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 1551847668072495.2394052835649; Tue, 5 Mar 2019 20:47:48 -0800 (PST) Received: from localhost ([127.0.0.1]:54266 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1OSx-0007xa-07 for importer@patchew.org; Tue, 05 Mar 2019 23:47:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36335) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1ORv-0007eG-Sz for qemu-devel@nongnu.org; Tue, 05 Mar 2019 23:46:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1ORs-0001rs-96 for qemu-devel@nongnu.org; Tue, 05 Mar 2019 23:46:33 -0500 Received: from smtp.lg.ehu.es ([158.227.0.66]:31997 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 1h1ORj-0001gh-Bu for qemu-devel@nongnu.org; Tue, 05 Mar 2019 23:46:26 -0500 Received: from imsva2.lgp.ehu.es (imsva2.lgp.ehu.es [10.0.3.246]) by postfix.smtp2.imsva2 (Postfix) with ESMTPS id 2E8EC2D3D; Wed, 6 Mar 2019 05:46:20 +0100 (CET) Received: from imsva2.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EEEE95A04F; Wed, 6 Mar 2019 05:46:19 +0100 (CET) Received: from imsva2.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E3A465A045; Wed, 6 Mar 2019 05:46:19 +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:46:19 +0100 (CET) Received: from 03612eec87fc (unknown [139.47.78.33]) by smtp2 (Postfix) with ESMTPSA id A1D382D3D; Wed, 6 Mar 2019 05:46:19 +0100 (CET) Date: Wed, 6 Mar 2019 04:46:20 +0000 From: Unai Martinez-Corral To: qemu-devel@nongnu.org Message-ID: <20190306044620.GC75@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:46:19 +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.060-7.0-31-10 X-imss-scan-details: No--0.060-7.0-31-10 X-TMASE-Version: IMSVA-9.1.0.1631-8.2.1013-24472.004 X-TMASE-Result: 10--0.059800-10.000000 X-TMASE-MatchedRID: a3o/0593/lo8mRT0SYY6fo6MisxJraxHecvjbu/xDjowEhHW5KVAzw/x 9pUv0o6LF8NKa4AxCmABe2S13w4YFs2Ew69EJjc0QpxiLlDD9FUIjen4m7yaqsWkDW4kV3WaZZZ 3VUEj3odNWTyNFwAkqdK1oiVNECWQK0GqbXFQeoWeAiCmPx4NwMidYBYDjITpGbCHby04y9gAGD UCklbGIsK21zBg2KlfKJvqFwff1POXSVPTnmE3XdRhGISf/raJdfcDcnHUvcewkqAiZH8vCHNKN DsixybQhlFBmMPmsnae6da7iZdmVs50GmUgU4JPqx8PzN6Mrq1Tq+NyuVQu+IbhWbmaLtpNkm94 VhWUY9vjdetbrmPKzcC+ksT6a9fy 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:46:20 +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 3/10] qemu-binfmt-conf.sh: add QEMU_CREDENTIAL and QEMU_PERSISTENT 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 options '--persistent' and/or '--credential' through environment variables. If not defined, defaults are used ('no'). Anyway, command-line arguments have priority over environment variables. Signed-off-by: Unai Martinez-Corral --- scripts/qemu-binfmt-conf.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index ca15ff8092..e7a714e22c 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -186,9 +186,11 @@ Usage: qemu-binfmt-conf.sh [--qemu-path PATH][--debian= ][--systemd CPU] (default: $SYSTEMDDIR or $DEBIANDIR) --credential: if present, credential and security tokens are calculated according to the binary to interpret + ($QEMU_CREDENTIAL=3Dyes) --persistent: if present, the interpreter is loaded when binfmt is configured and remains in memory. All future uses are cloned from the open file. + ($QEMU_PERSISTENT=3Dyes) To import templates with update-binfmts, use : @@ -255,10 +257,10 @@ qemu_check_systemd() { qemu_generate_register() { flags=3D"" - if [ "x$CREDENTIAL" =3D "xyes" ] ; then + if [ "x$QEMU_CREDENTIAL" =3D "xyes" ] ; then flags=3D"OC" fi - if [ "x$PERSISTENT" =3D "xyes" ] ; then + if [ "x$QEMU_PERSISTENT" =3D "xyes" ] ; then flags=3D"${flags}F" fi @@ -281,7 +283,7 @@ package qemu-$cpu interpreter $qemu magic $magic mask $mask -credential $CREDENTIAL +credential $QEMU_CREDENTIAL EOF } @@ -320,8 +322,10 @@ SYSTEMDDIR=3D"/etc/binfmt.d" DEBIANDIR=3D"/usr/share/binfmts" QEMU_PATH=3D/usr/local/bin -CREDENTIAL=3Dno -PERSISTENT=3Dno + +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:,qemu-path:,qemu-suff= ix:,exportdir:,help,credential,persistent -- "$@") @@ -373,10 +377,10 @@ while true ; do exit 1 ;; -c|--credential) - CREDENTIAL=3D"yes" + QEMU_CREDENTIAL=3D"yes" ;; -p|--persistent) - PERSISTENT=3D"yes" + QEMU_PERSISTENT=3D"yes" ;; *) break -- 2.20.1