On 06/03/2019 05:49, Unai Martinez-Corral wrote:
> Allow to set 'path' or 'suffix' through environment variables,
> consistently with 'persistent' and 'credential'.
>
> Signed-off-by: Unai Martinez-Corral <unai.martinezcor...@ehu.eus>
> ---
> scripts/qemu-binfmt-conf.sh | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
> index 68aa4c3f78..c113ff131e 100755
> --- a/scripts/qemu-binfmt-conf.sh
> +++ b/scripts/qemu-binfmt-conf.sh
> @@ -176,6 +176,7 @@ Usage: qemu-binfmt-conf.sh [--path
> PATH][--debian][--systemd CPU]
> --help: display this usage
> --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,
> @@ -321,13 +322,11 @@ BINFMT_SET=qemu_register_interpreter
> SYSTEMDDIR="/etc/binfmt.d"
> DEBIANDIR="/usr/share/binfmts"
>
> -QEMU_PATH=/usr/local/bin
> -
> +QEMU_PATH="${QEMU_PATH:-/usr/local/bin}"
> +QEMU_SUFFIX="${QEMU_SUFFIX:-}"
> QEMU_CREDENTIAL="${QEMU_CREDENTIAL:-no}"
> QEMU_PERSISTENT="${QEMU_PERSISTENT:-no}"
>
> -QEMU_SUFFIX=""
> -
> options=$(getopt -o ds:Q:S:e:hcp -l
> debian,systemd:,path:,suffix:,exportdir:,help,credential,persistent -- "$@")
> eval set -- "$options"
>
> --
> 2.20.1
>
Same question as for PATCH 3/10: why?
And I think the usage text should be formatted differently to be cleared and
looks
like more the one of qemu-XXX:
usage: qemu-m68k [options] program [arguments...]
Linux CPU emulator (compiled for m68k emulation)
Options and associated environment variables:
Argument Env-variable Description
-h print this help
-help
-g port QEMU_GDB wait gdb connection to 'port'
-L path QEMU_LD_PREFIX set the elf interpreter prefix to
'path'
-s size QEMU_STACK_SIZE set the stack size to 'size' bytes
...
Thanks,
Laurent
