From patchwork Wed Jun 27 20:53:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 935724 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41GFp71w6Vz9s19 for ; Thu, 28 Jun 2018 07:06:39 +1000 (AEST) Received: from localhost ([::1]:33243 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYHe9-0004Tg-0a for incoming@patchwork.ozlabs.org; Wed, 27 Jun 2018 17:06:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57002) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYHRl-0004GD-Ca for qemu-devel@nongnu.org; Wed, 27 Jun 2018 16:53:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYHRi-0003Zf-8j for qemu-devel@nongnu.org; Wed, 27 Jun 2018 16:53:49 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:42760) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYHRh-0003XC-U0 for qemu-devel@nongnu.org; Wed, 27 Jun 2018 16:53:46 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue007 [212.227.15.167]) with ESMTPSA (Nemesis) id 0Loeg3-1g4I8p20qJ-00gp7a; Wed, 27 Jun 2018 22:53:36 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 27 Jun 2018 22:53:15 +0200 Message-Id: <20180627205317.10343-2-laurent@vivier.eu> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180627205317.10343-1-laurent@vivier.eu> References: <20180627205317.10343-1-laurent@vivier.eu> X-Provags-ID: V03:K1:sCFZ6nJYl+w6oTJ/hPyLuySISH9UBmMkbgFDbw676Fb6R3xvWMC RXzvqJ/JdaJg3bul0mY56Sv7W+Yybt2YPPg44idLnNiQxmF7neHrmRlApeJkPz4tMgHnr+D or+GA5UbwJfzLBYv9XHam2zc3tINe3+RHrn41TO4XUZ0YNPFwraD6YSOFb8twM0Wyz/VujN wthtXpr3kNqzFhry7nsTw== X-UI-Out-Filterresults: notjunk:1; V01:K0:TPeeklcJ+Mw=:3UgThmunDWSrzIs9oZAK27 tC5r6C//uxzF61SD5wlmrsGlbeaYf4QWGovadiubywKl26fZBaDomBRHfrzgX3rNMmdgV68ZX 2TQu+8znnA7O9XwTdgMviiF81MXLo/hrw6BNSiwfi6zxbW+bzIYTQp7KZ8bRxOu81XPiUxQsc wpi6NprRGHR0NK1+sLOYcFXOolDNe5hOKZy/UAcgqwarzQHoxLkCQPVin8QTr9diBV3IYF0/+ 8doT2kw2GOxUGnhptWmaLJCSi2FR5fvKb1r0PstKQQ2Z7sDJBeVfDQqNqMLBl2CKiCY52RxVM D597MQT7V/c12ucsspHkaym4d6zAE6KpeWQABgTw6/t1mah7oY7r4TGqhNvGjjTdK9P63tJkm N0uie/V9h0gr3iKTgSmiTQUbo86jLBSnU1MV4kG3aamu4R2B2o9Dmru9iC29vrqKR3kdgyRwM qBlFr0M3MlyFioZ7+fAiKzdOiQp/H6pPIUelMPZlGLiHeRdqKL7rUK5vGgqR7gKIfngbZaw79 EXKwix72HW59vwdi4uvlbqhifw1ci+3vguvMrbfURC4patlOFByzFYJpRBT+v6Icn9D8UEo+B UTCpbr2Mm+7yDFurGCeDVKwwak5Ux7rBeW/+u5OLzAiu1MUJOKj6D2G1776Vcit8xANAdmum+ 5IAUPmv4UZm+mS6oujNCpRHAlQ9xJbgBQ0YaKdj3asIqG5mkpKT5WV1RoOjLzN2DHDxw= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.130 Subject: [Qemu-devel] [PATCH 1/3] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" move credential value to its own variable to be able to manage more flags Signed-off-by: Laurent Vivier --- 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() { } qemu_generate_register() { - echo ":qemu-$cpu:M::$magic:$mask:$qemu:$FLAGS" + flags="" + if [ "$CREDENTIAL" = "yes" ] ; then + flags="OC" + fi + + echo ":qemu-$cpu:M::$magic:$mask:$qemu:$flags" } qemu_register_interpreter() { @@ -260,10 +265,8 @@ package qemu-$cpu interpreter $qemu magic $magic mask $mask +credential $CREDENTIAL EOF - if [ "$FLAGS" = "OC" ] ; then - echo "credentials yes" >> "$EXPORTDIR/qemu-$cpu" - fi } qemu_set_binfmts() { @@ -300,7 +303,7 @@ SYSTEMDDIR="/etc/binfmt.d" DEBIANDIR="/usr/share/binfmts" QEMU_PATH=/usr/local/bin -FLAGS="" +CREDENTIAL=no options=$(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" = "yes" ] ; then - FLAGS="OC" - else - FLAGS="" - fi + CREDENTIAL="$1" ;; *) break