| Message ID | 20190311102942.GE16@765644dd90e5 (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | qemu-binfmt-conf.sh | expand |
On 11/03/2019 11:29, 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.martinezcorral@ehu.eus> > --- > scripts/qemu-binfmt-conf.sh | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh > index 0918f7fba6..13e619794c 100755 > --- a/scripts/qemu-binfmt-conf.sh > +++ b/scripts/qemu-binfmt-conf.sh > @@ -177,7 +177,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 > -d|--debian: don't write into /proc, generate update-binfmts templates > -s|--systemd CPU: don't write into /proc, generate file for > systemd-binfmt.service for the given CPU; if CPU is "ALL", > @@ -318,13 +318,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.21.0 > Reviewed-by: Laurent Vivier <laurent@vivier.eu>
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index 0918f7fba6..13e619794c 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -177,7 +177,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 -d|--debian: don't write into /proc, generate update-binfmts templates -s|--systemd CPU: don't write into /proc, generate file for systemd-binfmt.service for the given CPU; if CPU is "ALL", @@ -318,13 +318,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"
Allow to set 'path' or 'suffix' through environment variables, consistently with 'persistent' and 'credential'. Signed-off-by: Unai Martinez-Corral <unai.martinezcorral@ehu.eus> --- scripts/qemu-binfmt-conf.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) -- 2.21.0