Allow to set 'path' or 'suffix' through environment variables,
consistently with 'persistent' and 'credential'.
Signed-off-by: Unai Martinez-Corral <unai.martinezcor...@ehu.eus>
Reviewed-by: Laurent Vivier <laur...@vivier.eu>
---
scripts/qemu-binfmt-conf.sh | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
index 5cc6db6aed..b1a54aa470 100755
--- a/scripts/qemu-binfmt-conf.sh
+++ b/scripts/qemu-binfmt-conf.sh
@@ -181,7 +181,7 @@ Options and associated environment variables:
Argument Env-variable Description
-h|--help display this usage
-Q|--path PATH QEMU_PATH set path to qemu interpreter(s)
--F|--suffix SUFFIX add a suffix to the default interpreter
name
+-F|--suffix SUFFIX QEMU_SUFFIX add a suffix to the default interpreter
name
-p|--persistent QEMU_PERSISTENT (yes) load the interpreter and keep it
in memory; all future
uses are cloned from the open file.
-c|--credential QEMU_CREDENTIAL (yes) credential and security tokens are
calculated according
@@ -195,6 +195,7 @@ Argument Env-variable Description
Defaults:
QEMU_PATH=$QEMU_PATH
+QEMU_SUFFIX=$QEMU_SUFFIX
QEMU_PERSISTENT=$QEMU_PERSISTENT
QEMU_CREDENTIAL=$QEMU_CREDENTIAL
@@ -327,13 +328,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_PERSISTENT="${QEMU_PERSISTENT:-no}"
QEMU_CREDENTIAL="${QEMU_CREDENTIAL:-no}"
-QEMU_SUFFIX=""
-
options=$(getopt -o ds:Q:S:e:hcp -l
debian,systemd:,path:,suffix:,exportdir:,help,credential,persistent -- "$@")
eval set -- "$options"
--
2.25.1
