From nobody Wed Apr 2 07:09:57 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1583606805; cv=none; d=zohomail.com; s=zohoarc; b=I1dK0W5FhbV3P+HX3z4jeKsb9fU3TJIRzP8bw4O/s3RizkiG52WRw0DsIoL5iIaSlfJBdz3BDK/kz25LyCNKpBHYqbGmQwH1tVve8MQxa4mCys5wbb0saiJzxy91JrIilmZEi79vMfaABKezHWF/RMjO159ksJWHdB4suIeSyag= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583606805; h=Content-Type:Cc: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=1KgSdCMyI4uUK7gT/3vK0RGziHPM2RLkCv2SXIy4Dwg=; b=kNjqB4kSN8l1NOXtIsgQtf8wnGhVi/7/69NvTPbvdDpmP+rwgNZ3iK4OM3J5bSLFwBiDfLc5+yV6q+cBw8PhkK1SthGaWF4xcNxiLZtE2I/3IDGj70VJXJYAPyCb7FIbOP5aA+VvVxdPKQAKBaRqFkXqtr2SlDWAv6GIW5Xe0oY= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.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 1583606805586902.2647217073702; Sat, 7 Mar 2020 10:46:45 -0800 (PST) Received: from localhost ([::1]:51754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAeTD-0006bC-Th for importer@patchew.org; Sat, 07 Mar 2020 13:46:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35102) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAeSN-0006Ao-Iu for qemu-devel@nongnu.org; Sat, 07 Mar 2020 13:45:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAeSM-0001ME-2F for qemu-devel@nongnu.org; Sat, 07 Mar 2020 13:45:51 -0500 Received: from smtp.lg.ehu.es ([158.227.0.66]:29240 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 1jAeSL-0001Ij-NZ for qemu-devel@nongnu.org; Sat, 07 Mar 2020 13:45:50 -0500 Received: from imsva1.lgp.ehu.es (imsva1.lgp.ehu.es [10.0.3.245]) by postfix.smtp1.imsva1 (Postfix) with ESMTPS id 864CB2D904; Sat, 7 Mar 2020 19:45:47 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 43DEE11004A; Sat, 7 Mar 2020 19:45:47 +0100 (CET) Received: from imsva1.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3802F110045; Sat, 7 Mar 2020 19:45:47 +0100 (CET) Received: from smtp.ehu.eus (unknown [10.0.100.73]) by imsva1.lgp.ehu.es (Postfix) with ESMTPS; Sat, 7 Mar 2020 19:45:47 +0100 (CET) Received: from afee69d503a7 (unknown [81.0.0.187]) by smtp1 (Postfix) with ESMTPSA id E5BDB2D904; Sat, 7 Mar 2020 19:45:46 +0100 (CET) Date: Sat, 7 Mar 2020 18:45:45 +0000 From: Unai Martinez-Corral To: qemu-devel@nongnu.org Subject: [PATCH v8 3/9] qemu-binfmt-conf.sh: add QEMU_CREDENTIAL and QEMU_PERSISTENT Message-ID: <20200307184545.GB37@afee69d503a7> References: <20200307170251.GA7@dd5f6ec33fb0> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200307170251.GA7@dd5f6ec33fb0> X-Greylist: ACL 184 matched, not delayed by milter-greylist-4.6.2 (smtp1 [10.0.100.73]); Sat, 07 Mar 2020 19:45:47 +0100 (CET) X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSVA-9.1.0.1631-8.5.0.1020-25276.002 X-TM-AS-Result: No-1.919-7.0-31-10 X-imss-scan-details: No-1.919-7.0-31-10 X-TMASE-Version: IMSVA-9.1.0.1631-8.5.1020-25276.002 X-TMASE-Result: 10-1.919100-10.000000 X-TMASE-MatchedRID: ehvrJQ9m4PA8mRT0SYY6fo6MisxJraxH9e5am3m57X1irg8tJChsdOp9 RpeIFYR4f+3yqvQrlggtpxclXgLOJWJZXQNDzktSKrDHzH6zmUVzHsCOuSqn1gNZ45IRIZKg9WX m+yhJKyifvlup6aJGjuGJ0uaQ7XfxDvX2Sk47fs+VyEX4i+SWU+wlOGZoQVV0DpCUEeEFm7A8HP DFMN8fIiE3155ICPJPmyiLZetSf8mfYwIIcLjjbeGANVBCTxXNC24oEZ6SpSk6XEE7Yhw4FjYhL YVN7agli63pxu/S4xQSFXeoRq3xmaeqmMHxXeINQHHENQU9/NzPbq/ALUNTOmZgCXkOZpTlzpuq aZzc8oIUzt6CYykYPCtxJPipEDOM5s49x043aLlHPwBafde3Eazr0/cAC14wuP7sWlKY/sdnIxZ yJs78kg== 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.6.2 (postfix.smtp1.imsva1 [10.0.100.73]); Sat, 07 Mar 2020 19:45:47 +0100 (CET) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 158.227.0.66 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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 75eb19c3bf..347cddf698 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -190,9 +190,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) =20 To import templates with update-binfmts, use : =20 @@ -259,10 +261,10 @@ qemu_check_systemd() { =20 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 =20 @@ -285,7 +287,7 @@ package qemu-$cpu interpreter $qemu magic $magic mask $mask -credential $CREDENTIAL +credential $QEMU_CREDENTIAL EOF } =20 @@ -324,8 +326,10 @@ SYSTEMDDIR=3D"/etc/binfmt.d" DEBIANDIR=3D"/usr/share/binfmts" =20 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"" =20 options=3D$(getopt -o ds:Q:S:e:hcp -l debian,systemd:,qemu-path:,qemu-suff= ix:,exportdir:,help,credential,persistent -- "$@") @@ -377,10 +381,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 --=20 2.25.1