Commit 7155be7c authored by Laurent Vivier's avatar Laurent Vivier
Browse files

qemu-binfmt-conf.sh: allow to provide a suffix to the interpreter name 



some distros provide a qemu-CPU-static binary beside the qemu-CPU one.
This change allows to use it by providing "--qemu-suffix -static" to the
script.

Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
Message-Id: <20180627205317.10343-4-laurent@vivier.eu>
parent 01ecd22a

scripts/qemu-binfmt-conf.sh

+24 −17
Original line number Diff line number Diff line
@@ -161,12 +161,13 @@ usage() { 
    cat <<EOF

Usage: qemu-binfmt-conf.sh [--qemu-path PATH][--debian][--systemd CPU]

                           [--help][--credential yes|no][--exportdir PATH]

                           [--persistent yes|no]

                           [--persistent yes|no][--qemu-suffix SUFFIX]



       Configure binfmt_misc to use qemu interpreter



       --help:        display this usage

       --qemu-path:   set path to qemu interpreter ($QEMU_PATH)

       --qemu-suffix: add a suffix to the default interpreter name

       --debian:      don't write into /proc,

                      instead generate update-binfmts templates

       --systemd:     don't write into /proc,
@@ -297,6 +298,7 @@ qemu_set_binfmts() { 
            qemu="$QEMU_PATH/qemu-i386"

        fi



        qemu="$qemu$QEMU_SUFFIX"

        if [ "$host_family" != "$family" ] ; then

            $BINFMT_SET

        fi
@@ -312,8 +314,9 @@ DEBIANDIR="/usr/share/binfmts" 
QEMU_PATH=/usr/local/bin

CREDENTIAL=no

PERSISTENT=no

QEMU_SUFFIX=""



options=$(getopt -o ds:Q:e:hc:p: -l debian,systemd:,qemu-path:,exportdir:,help,credential:,persistent: -- "$@")

options=$(getopt -o ds:Q:S:e:hc:p: -l debian,systemd:,qemu-path:,qemu-suffix:,exportdir:,help,credential:,persistent: -- "$@")

eval set -- "$options"



while true ; do
@@ -349,6 +352,10 @@ while true ; do 
        shift

        QEMU_PATH="$1"

        ;;

    -F|--qemu-suffix)

        shift

        QEMU_SUFFIX="$1"

        ;;

    -e|--exportdir)

        shift

        EXPORTDIR="$1"