From nobody Wed Apr 2 06:48:05 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 1551848040950902.1169933816955; Tue, 5 Mar 2019 20:54:00 -0800 (PST) Received: from localhost ([127.0.0.1]:54321 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1OZ2-0002Lk-Su for importer@patchew.org; Tue, 05 Mar 2019 23:53:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37244) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1OY8-000235-Kg for qemu-devel@nongnu.org; Tue, 05 Mar 2019 23:53:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1OY7-0005Xy-Hr for qemu-devel@nongnu.org; Tue, 05 Mar 2019 23:53:00 -0500 Received: from smtp.lg.ehu.es ([158.227.0.66]:27791 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 1h1OY4-0005U7-Gk for qemu-devel@nongnu.org; Tue, 05 Mar 2019 23:52:59 -0500 Received: from imsva2.lgp.ehu.es (imsva2.lgp.ehu.es [10.0.3.246]) by postfix.smtp2.imsva2 (Postfix) with ESMTPS id 14C012D3D; Wed, 6 Mar 2019 05:52:52 +0100 (CET) Received: from imsva2.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C52EB5A04F; Wed, 6 Mar 2019 05:52:51 +0100 (CET) Received: from imsva2.lgp.ehu.es (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B99115A045; Wed, 6 Mar 2019 05:52:51 +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:52:51 +0100 (CET) Received: from 03612eec87fc (unknown [139.47.78.33]) by smtp2 (Postfix) with ESMTPSA id 751102D3D; Wed, 6 Mar 2019 05:52:51 +0100 (CET) Date: Wed, 6 Mar 2019 04:52:52 +0000 From: Unai Martinez-Corral To: qemu-devel@nongnu.org Message-ID: <20190306045252.GG75@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:52:51 +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--4.158-7.0-31-10 X-imss-scan-details: No--4.158-7.0-31-10 X-TMASE-Version: IMSVA-9.1.0.1631-8.2.1013-24472.004 X-TMASE-Result: 10--4.158200-10.000000 X-TMASE-MatchedRID: x/EPlNU2vY08mRT0SYY6ftTXZe7/fokgbYZQU1whlX9UjspoiX02F8Pn D/CT46hF7ZfN05L+GUJ0xH360N5TM9YqWwyVXB9DdOc7KAdVCk7UqhJbkmLVexae5J4l8aLz5gc Q9o9yjpuVu5TRVGSDEQuinfgZ2xrHw06jXpUJ/XIZXJLztZviXBbjReJSRusbfJkt0kSNAe1m+j 6YVbX2YOhURetUfQ4BJBR9boLgnggtJMbDWD8p3t35+5/2RxqmK2i9pofGVSvxxaAXDrCns5xak 1lKPxhNfAf9+hJ7151+XHMTeEdcYW7vEKjEI8LyHcQQBuf4ZFt9LQinZ4QefHUIH+25YvS80+iQ wApCn9sD+c09Hd/d3MprJP8FBOIaTxc4wpH5GFJL+C5hJBQNPH6BUtwo5foINveFbXFnOBgdPJ8 4MM1Q5hxNdDH4vp0s8obWMnIbCc2Y1bpt/JGTUaGUVnbtWe9B85PmlIIazKLGdrQxGzmqhmbMTv hNxfbfmRe1anfHjAYFTcazvERT8w== 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:52:52 +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 7/10] qemu-binfmt-conf.sh: add option --reset 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" This is a partial implementation. Allows to remove a single or a list of already registered binfmt interpreters. If is a list, it must be comma-separated. Valid values are those in qemu_target_list. If is 'ALL', all the existing 'qemu-*' interpreters are removed. This is partial because 'debian' and 'systemd' configurations are not removed. If option 'reset' is provided before any of those, reset is executed first and the configuration proceeds. However, if 'reset' is provided after any of them, the script will exit with error 'option reset not implemented for this mode yet'. Removal is done by printing '-1' as explained at: https://www.kernel.org/doc/Documentation/admin-guide/binfmt-misc.rst Signed-off-by: Unai Martinez-Corral --- scripts/qemu-binfmt-conf.sh | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index 2751363089..824e3c4c34 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -197,8 +197,8 @@ qemu_get_family() { usage() { cat <&2 + usage + exit 1 +} + +qemu_remove_interpreter() { + names=3D'qemu-*' + if [ "x$1" !=3D "xALL" ] ; then + qemu_check_target_list $1 + unset names pre + for t in $checked_target_list ; do + names=3D"${names}${pre}qemu-$t" + pre=3D' -o -name ' + done + fi + find /proc/sys/fs/binfmt_misc/ -type f -name $names -exec sh -c 'print= f %s -1 > {}' \; +} + CHECK=3Dqemu_check_bintfmt_misc BINFMT_SET=3Dqemu_register_interpreter +BINFMT_REMOVE=3Dqemu_remove_interpreter SYSTEMDDIR=3D"/etc/binfmt.d" DEBIANDIR=3D"/usr/share/binfmts" @@ -364,19 +387,26 @@ QEMU_SUFFIX=3D"${QEMU_SUFFIX:-}" QEMU_CREDENTIAL=3D"${QEMU_CREDENTIAL:-no}" QEMU_PERSISTENT=3D"${QEMU_PERSISTENT:-no}" -options=3D$(getopt -o :dsQ:S:e:hcp -l debian,systemd,path:,suffix:,exportd= ir:,help,credential,persistent -- "$@") +options=3D$(getopt -o r:dsQ:S:e:hcp -l reset:,debian,systemd,path:,suffix:= ,exportdir:,help,credential,persistent -- "$@") eval set -- "$options" while true ; do case "$1" in + -r|--reset) + shift + $CHECK + qemu_remove_interpreter $1 + ;; -d|--debian) CHECK=3Dqemu_check_debian BINFMT_SET=3Dqemu_generate_debian + BINFMT_REMOVE=3Dqemu_remove_notimplemented EXPORTDIR=3D${EXPORTDIR:-$DEBIANDIR} ;; -s|--systemd) CHECK=3Dqemu_check_systemd BINFMT_SET=3Dqemu_generate_systemd + BINFMT_REMOVE=3Dqemu_remove_notimplemented EXPORTDIR=3D${EXPORTDIR:-$SYSTEMDDIR} ;; -Q|--path) -- 2.20.1