Re: [Qemu-devel] [PATCH v3 8/10] qemu-binfmt-conf.sh: refactor usage()

[Laurent Vivier <laurent@vivier.eu>]

On 06/03/2019 05:53, Unai Martinez-Corral wrote:
> Reorder how the options are presented to the user. Move 'systemd'
> and 'debian' to the end, so that the latter is close to the additional
> comments and example commands about it. Make the order in the prototype
> consistent with the list where each option is explained.
> 
> Signed-off-by: Unai Martinez-Corral <unai.martinezcorral@ehu.eus>
> ---
>  scripts/qemu-binfmt-conf.sh | 34 +++++++++++++++++-----------------
>  1 file changed, 17 insertions(+), 17 deletions(-)
> 
> diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
> index 824e3c4c34..4a45636b53 100755
> --- a/scripts/qemu-binfmt-conf.sh
> +++ b/scripts/qemu-binfmt-conf.sh
> @@ -197,9 +197,9 @@ qemu_get_family() {
> 
>  usage() {
>      cat <<EOF
> -Usage: qemu-binfmt-conf.sh [--help][--path PATH][--debian][--systemd]
> -                           [--reset ARCHS][--credential][--exportdir PATH]
> -                           [--persistent][--suffix SUFFIX][CPUS]
> +Usage: qemu-binfmt-conf.sh [--help][--path PATH][--suffix SUFFIX]
> +                           [--persistent][--credential][--exportdir PATH]
> +                           [--reset ARCHS][--systemd][--debian][CPUS]
> 
>         Configure binfmt_misc to use qemu interpreter for the given CPUS.
>         Supported formats for CPUS are: single arch or comma/space separated list.
> @@ -210,25 +210,25 @@ Usage: qemu-binfmt-conf.sh [--help][--path PATH][--debian][--systemd]
>         --path:        set path to qemu interpreter ($QEMU_PATH)
>         --suffix:      add a suffix to the default interpreter name
>                        ($QEMU_SUFFIX)
> -       --debian:      don't write into /proc,
> -                      instead generate update-binfmts templates
> -       --systemd:     don't write into /proc,
> -                      instead generate file for systemd-binfmt.service;
> -                      environment variable HOST_ARCH allows to override 'uname'
> -                      to generate configuration files for a different
> -                      architecture than the current one.
> +       --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=yes)
> +       --credential:  if present, credential and security tokens are
> +                      calculated according to the binary to interpret
> +                      ($QEMU_CREDENTIAL=yes)
>         --exportdir:   define where to write configuration files
>                        (default: $SYSTEMDDIR or $DEBIANDIR)
>         --reset:       remove registered interpreter for target ARCHS (comma
>                        separated list). If ARCHS is 'ALL', remove all registered
>                        'qemu-*' interpreters.
> -       --credential:  if present, credential and security tokens are
> -                      calculated according to the binary to interpret
> -                      ($QEMU_CREDENTIAL=yes)
> -       --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=yes)
> +       --systemd:     don't write into /proc,
> +                      instead generate file for systemd-binfmt.service;
> +                      environment variable HOST_ARCH allows to override 'uname'
> +                      to generate configuration files for a different
> +                      architecture than the current one.
> +       --debian:      don't write into /proc,
> +                      instead generate update-binfmts templates
> 
>      To import templates with update-binfmts, use :
> 

Please, use the same presentation format as for qemu-XXX ("Argument
       Env-variable      Description")

Thanks,
Laurent