| Message ID | 20190311202319.GH9@59ca1d9b7985 |
|---|---|
| State | New |
| Headers | show |
| Series | qemu-binfmt-conf.sh | expand |
On 11/03/2019 21:23, Unai Martinez-Corral wrote: > This is a partial implementation. > > Allows to remove a single or a list of already registered binfmt > interpreters. Valid values are those in qemu_target_list. > If TARGETS is empty, all the existing 'qemu-*' interpreters are > removed. > > This is partial because 'debian' and 'systemd' configurations are not > supported. The script will exit with error 'option clear 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 <unai.martinezcorral@ehu.eus> > --- > scripts/qemu-binfmt-conf.sh | 39 +++++++++++++++++++++++++++++++++++-- > 1 file changed, 37 insertions(+), 2 deletions(-) > > diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh > index 2be9867727..382bdaabfe 100755 > --- a/scripts/qemu-binfmt-conf.sh > +++ b/scripts/qemu-binfmt-conf.sh > @@ -197,7 +197,7 @@ Options and associated environment variables: > > Argument Env-variable Description > TARGETS QEMU_TARGETS A single arch name or a list of them (see all names below); > - if empty, configure all known targets; > + if empty, configure/clear all known targets; > if 'NONE', no interpreter is configured. > -h|--help display this usage > -Q|--path PATH QEMU_PATH set path to qemu interpreter(s) > @@ -206,6 +206,8 @@ TARGETS QEMU_TARGETS A single arch name or a list of them (see > uses are cloned from the open file. > -c|--credential QEMU_CREDENTIAL (yes) credential and security tokens are calculated according > to the binary to interpret > +-r|--clear QEMU_CLEAR (yes) remove registered interpreters for target TARGETS; > + then exit. > -e|--exportdir PATH DEBIANDIR define where to write configuration files > SYSTEMDDIR > -s|--systemd don't write into /proc, generate file(s) for > @@ -218,6 +220,7 @@ QEMU_PATH=$QEMU_PATH > QEMU_SUFFIX=$QEMU_SUFFIX > QEMU_PERSISTENT=$QEMU_PERSISTENT > QEMU_CREDENTIAL=$QEMU_CREDENTIAL > +QEMU_CLEAR=$QEMU_CLEAR > > To import templates with update-binfmts, use : > > @@ -344,8 +347,28 @@ qemu_set_binfmts() { > done > } > > +qemu_clear_notimplemented() { > + echo "ERROR: option clear not implemented for this mode yet" 1>&2 > + usage > + exit 1 > +} > + > +qemu_clear_interpreter() { > + names='qemu-*' > + if [ $# -ne 0 ] ; then > + qemu_check_target_list $1 > + unset names pre > + for t in $checked_target_list ; do > + names="${names}${pre}qemu-$t" > + pre=' -o -name ' > + done > + fi > + find /proc/sys/fs/binfmt_misc/ -type f -name "$names" -exec sh -c 'printf %s -1 > {}' \; You don't need to use "find". put the printf in the loop with the full path /proc/sys/fs/binfmt_mist/qemu-$t. For the ALL case, use the list of the known interpreters, or if you want to remove them all, use the "status" file that does that. Thanks, Laurent
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index 2be9867727..382bdaabfe 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -197,7 +197,7 @@ Options and associated environment variables: Argument Env-variable Description TARGETS QEMU_TARGETS A single arch name or a list of them (see all names below); - if empty, configure all known targets; + if empty, configure/clear all known targets; if 'NONE', no interpreter is configured. -h|--help display this usage -Q|--path PATH QEMU_PATH set path to qemu interpreter(s) @@ -206,6 +206,8 @@ TARGETS QEMU_TARGETS A single arch name or a list of them (see uses are cloned from the open file. -c|--credential QEMU_CREDENTIAL (yes) credential and security tokens are calculated according to the binary to interpret +-r|--clear QEMU_CLEAR (yes) remove registered interpreters for target TARGETS; + then exit. -e|--exportdir PATH DEBIANDIR define where to write configuration files SYSTEMDDIR -s|--systemd don't write into /proc, generate file(s) for @@ -218,6 +220,7 @@ QEMU_PATH=$QEMU_PATH QEMU_SUFFIX=$QEMU_SUFFIX QEMU_PERSISTENT=$QEMU_PERSISTENT QEMU_CREDENTIAL=$QEMU_CREDENTIAL +QEMU_CLEAR=$QEMU_CLEAR To import templates with update-binfmts, use : @@ -344,8 +347,28 @@ qemu_set_binfmts() { done } +qemu_clear_notimplemented() { + echo "ERROR: option clear not implemented for this mode yet" 1>&2 + usage + exit 1 +} + +qemu_clear_interpreter() { + names='qemu-*' + if [ $# -ne 0 ] ; then + qemu_check_target_list $1 + unset names pre + for t in $checked_target_list ; do + names="${names}${pre}qemu-$t" + pre=' -o -name ' + done + fi + find /proc/sys/fs/binfmt_misc/ -type f -name "$names" -exec sh -c 'printf %s -1 > {}' \; +} + CHECK=qemu_check_bintfmt_misc BINFMT_SET=qemu_register_interpreter +BINFMT_CLEAR=qemu_clear_interpreter SYSTEMDDIR="/etc/binfmt.d" DEBIANDIR="/usr/share/binfmts" @@ -355,20 +378,26 @@ QEMU_PATH="${QEMU_PATH:-/usr/local/bin}" QEMU_SUFFIX="${QEMU_SUFFIX:-}" QEMU_PERSISTENT="${QEMU_PERSISTENT:-no}" QEMU_CREDENTIAL="${QEMU_CREDENTIAL:-no}" +QEMU_CLEAR="${QEMU_CLEAR:-no}" -options=$(getopt -o dsQ:S:e:hcp -l debian,systemd,path:,suffix:,exportdir:,help,credential,persistent -- "$@") +options=$(getopt -o rdsQ:S:e:hcp -l clear,debian,systemd,path:,suffix:,exportdir:,help,credential,persistent -- "$@") eval set -- "$options" while true ; do case "$1" in + -r|--clear) + QEMU_CLEAR="yes" + ;; -d|--debian) CHECK=qemu_check_debian BINFMT_SET=qemu_generate_debian + BINFMT_CLEAR=qemu_clear_notimplemented EXPORTDIR=${EXPORTDIR:-$DEBIANDIR} ;; -s|--systemd) CHECK=qemu_check_systemd BINFMT_SET=qemu_generate_systemd + BINFMT_CLEAR=qemu_clear_notimplemented EXPORTDIR=${EXPORTDIR:-$SYSTEMDDIR} ;; -Q|--path) @@ -403,4 +432,10 @@ done shift $CHECK + +if [ "x$QEMU_CLEAR" = "xyes" ] ; then + $BINFMT_CLEAR "$@" + exit +fi + qemu_set_binfmts "$@"
This is a partial implementation. Allows to remove a single or a list of already registered binfmt interpreters. Valid values are those in qemu_target_list. If TARGETS is empty, all the existing 'qemu-*' interpreters are removed. This is partial because 'debian' and 'systemd' configurations are not supported. The script will exit with error 'option clear 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 <unai.martinezcorral@ehu.eus> --- scripts/qemu-binfmt-conf.sh | 39 +++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) -- 2.21.0