From nobody Tue Nov 4 18:40:40 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530636091807167.23539763751285; Tue, 3 Jul 2018 09:41:31 -0700 (PDT) Received: from localhost ([::1]:41661 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faOMt-0004Rp-3h for importer@patchew.org; Tue, 03 Jul 2018 12:41:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49608) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faOGY-0007rF-DY for qemu-devel@nongnu.org; Tue, 03 Jul 2018 12:34:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faOGU-0005aV-GI for qemu-devel@nongnu.org; Tue, 03 Jul 2018 12:34:58 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:51501) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1faOGU-0005Zs-6I for qemu-devel@nongnu.org; Tue, 03 Jul 2018 12:34:54 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LzFY5-1gDcqi1exF-014Vni; Tue, 03 Jul 2018 18:34:13 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 3 Jul 2018 18:34:45 +0200 Message-Id: <20180703163451.16936-2-laurent@vivier.eu> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703163451.16936-1-laurent@vivier.eu> References: <20180703163451.16936-1-laurent@vivier.eu> X-Provags-ID: V03:K1:h9I4JdORuapCm4xOgcaigkgL5YLOYpRWR12+FwDf+QvVpvjOXFp 1LrWg39/tGvj4qwN0kq836EPpmnUL0ctRl1+S91u2Shg2yrXBtRWHBGz4bMoSQaJrx+9rWQ UxtZbWJyaub89YvxYc72OV+Ya8JFWAF28gv5w1IEJ3y/3TLiK8LMqLzA4RcAFmrbM2HNGro L5M15wtqHSRkAXgfd3/Aw== X-UI-Out-Filterresults: notjunk:1;V01:K0:7XDOAVpCH6o=:PkO+KPtecGRctHAbU90UA5 YerCoamFCNhNoHZKB0pEYVXZfzUHTUw5CTE8/Ft8nkASErjbW2NEbzQ1PMPSxw2uLSr95FsK+ KSCE/lymO/B03LCSAODYZdwkMyRFj1rjok43vngm7K5yEa+rW4COwrt5/QmBa+vskqf5SyKeF xm778u9kjOroHgrsuvEiZPxjfzfkt9xmO67ZCWVyz+k+tOohbQ0JZg39xx6/we4GtQ4LAPeY6 FZwFISGKPms7rqR9LVgi4+GnT0JdhtMv9AzP5d02FW4UlQ7Za8bv+DPiC/zzDAPKBsnHl+0Kz SvH4A/zItYLYkXvUjcDR77yM1qFVy8/Cjdpanqcy28qhtm494Tcs1Y+aABZ2C21DFtWYqLDn1 Cx6sdZtUUABuM5rD+VrS0KXX6BO4ntR0B4BgpGOXPkkzoz1YPMl481vKaEbk9QsQo6FgFumXw jzsawzQJq83naV3NF8+Ol76wz/Wwa8HtB/xcjFu8KwxfvdQCe+XswUPfRpXqSS6bdRFXeG3pt QM9JBgusnSJFFjyNQTdu3CyyPquSKHwWeeP8Nl4b0IAqC0Pg33W1eTvD72yWqOug3wGaBmcbM wRk10gph/8nUj+FPsXTJRvzZWE4dsN7NYkoVEMqDNjsX33T97Z35Twhn+Y1tf48r4x0Jlpv7p c5nhWtRTfN3BICEuBGeey4/2G6SKbL6phZtU12wGgsqTiZQQw1nRBmpqAxaLOxB0xKSw= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PULL 1/7] qemu-binfmt-conf.sh: cleanup --credential 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 , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" move credential value to its own variable to be able to manage more flags Signed-off-by: Laurent Vivier Message-Id: <20180627205317.10343-2-laurent@vivier.eu> --- scripts/qemu-binfmt-conf.sh | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index d7eefda0b8..9900554608 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -241,7 +241,12 @@ qemu_check_systemd() { } =20 qemu_generate_register() { - echo ":qemu-$cpu:M::$magic:$mask:$qemu:$FLAGS" + flags=3D"" + if [ "$CREDENTIAL" =3D "yes" ] ; then + flags=3D"OC" + fi + + echo ":qemu-$cpu:M::$magic:$mask:$qemu:$flags" } =20 qemu_register_interpreter() { @@ -260,10 +265,8 @@ package qemu-$cpu interpreter $qemu magic $magic mask $mask +credential $CREDENTIAL EOF - if [ "$FLAGS" =3D "OC" ] ; then - echo "credentials yes" >> "$EXPORTDIR/qemu-$cpu" - fi } =20 qemu_set_binfmts() { @@ -300,7 +303,7 @@ SYSTEMDDIR=3D"/etc/binfmt.d" DEBIANDIR=3D"/usr/share/binfmts" =20 QEMU_PATH=3D/usr/local/bin -FLAGS=3D"" +CREDENTIAL=3Dno =20 options=3D$(getopt -o ds:Q:e:hc: -l debian,systemd:,qemu-path:,exportdir:,= help,credential: -- "$@") eval set -- "$options" @@ -348,11 +351,7 @@ while true ; do ;; -c|--credential) shift - if [ "$1" =3D "yes" ] ; then - FLAGS=3D"OC" - else - FLAGS=3D"" - fi + CREDENTIAL=3D"$1" ;; *) break --=20 2.17.1