From nobody Wed Apr 2 06:52:14 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 1552417812359842.0180890560125; Tue, 12 Mar 2019 12:10:12 -0700 (PDT) Received: from localhost ([127.0.0.1]:58224 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3mmv-00085K-8e for importer@patchew.org; Tue, 12 Mar 2019 15:10:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51274) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3meu-0000F5-1e for qemu-devel@nongnu.org; Tue, 12 Mar 2019 15:01:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3mbB-0002Zr-HN for qemu-devel@nongnu.org; Tue, 12 Mar 2019 14:58:02 -0400 Received: from smtp.lg.ehu.es ([158.227.0.66]:10634 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 1h3mbB-0002Yn-5T for qemu-devel@nongnu.org; Tue, 12 Mar 2019 14:58:01 -0400 Received: from imsva1.lgp.ehu.es (imsva1.lgp.ehu.es [10.0.3.245]) by postfix.smtp1.imsva1 (Postfix) with ESMTPS id 3B5C934BDC; Tue, 12 Mar 2019 19:58:00 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 132EB11004A; Tue, 12 Mar 2019 19:58:00 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 06DA9110045; Tue, 12 Mar 2019 19:58:00 +0100 (CET) Received: from smtp.ehu.eus (unknown [10.0.100.73]) by imsva1.lgp.ehu.es (Postfix) with ESMTPS; Tue, 12 Mar 2019 19:57:59 +0100 (CET) Received: from 803a063d172d (unknown [139.47.78.33]) by smtp1 (Postfix) with ESMTPSA id B53DC34BDC; Tue, 12 Mar 2019 19:57:59 +0100 (CET) Date: Tue, 12 Mar 2019 18:58:00 +0000 From: Unai Martinez-Corral To: qemu-devel@nongnu.org Message-ID: <20190312185800.GC15@803a063d172d> References: <20190312185541.GA13@803a063d172d> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190312185541.GA13@803a063d172d> User-Agent: Mutt/1.11.2 (2019-01-07) X-Greylist: ACL 177 matched, not delayed by milter-greylist-4.4.3 (smtp1); Tue, 12 Mar 2019 19:57:59 +0100 (CET) X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSVA-9.1.0.1631-8.2.0.1013-24486.002 X-TM-AS-Result: No-1.120-7.0-31-10 X-imss-scan-details: No-1.120-7.0-31-10 X-TMASE-Version: IMSVA-9.1.0.1631-8.2.1013-24486.002 X-TMASE-Result: 10-1.120100-10.000000 X-TMASE-MatchedRID: P7d3tDo+wQo8mRT0SYY6fo6MisxJraxHecvjbu/xDjowEhHW5KVAzzO+ sIxDA42K0pQhZpR72XZU4ZaPWnopPibhJjVR0U351yMJs9mBCcUr2PDgwMWbIoKwF4K/wIz9AxE 7O5AxMWucHepQtiMfOBTcMjpPwLpOetI/1G0ZlijJ1E/nrJFEDxny1I2tysbymyiLZetSf8mfYw IIcLjjbeGANVBCTxXNC24oEZ6SpSlR8RAUGq/SZ2SWUv9NGeIZ4a2FNkv7/SSZMZldyp3i92NQ/ ugow9TVFE+rSqK76FhLxAWur9nHVLlY4DWRtTxP9j0acPgOcNyLORRq70g+bTfRxNq5/jk8Z6j2 OO0xbkIzq0nucUGfkI5AUTt0AWgUSac++I+/Ls3AvpLE+mvX8g== 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); Tue, 12 Mar 2019 19:58:00 +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 v6 3/9] 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 Reviewed-by: Laurent Vivier --- 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..ad9ae731a0 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_PERSISTENT=3D"${QEMU_PERSISTENT:-no}" +QEMU_CREDENTIAL=3D"${QEMU_CREDENTIAL:-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.21.0