diff options
| author | Laurent Vivier | 2018-06-27 22:53:15 +0200 |
|---|---|---|
| committer | Laurent Vivier | 2018-07-02 20:16:35 +0200 |
| commit | 70a77984b3ecc8adc7be42cd22fa3fd103874e49 (patch) | |
| tree | c6f7d1c663fd66f246b5af29241ef6a7798f4503 /scripts | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20180702' into staging (diff) | |
| download | qemu-70a77984b3ecc8adc7be42cd22fa3fd103874e49.tar.gz qemu-70a77984b3ecc8adc7be42cd22fa3fd103874e49.tar.xz qemu-70a77984b3ecc8adc7be42cd22fa3fd103874e49.zip | |
qemu-binfmt-conf.sh: cleanup --credential
move credential value to its own variable to be able to manage
more flags
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20180627205317.10343-2-laurent@vivier.eu>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/qemu-binfmt-conf.sh | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index d7eefda0b8..9900554608 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -241,7 +241,12 @@ qemu_check_systemd() { } qemu_generate_register() { - echo ":qemu-$cpu:M::$magic:$mask:$qemu:$FLAGS" + flags="" + if [ "$CREDENTIAL" = "yes" ] ; then + flags="OC" + fi + + echo ":qemu-$cpu:M::$magic:$mask:$qemu:$flags" } qemu_register_interpreter() { @@ -260,10 +265,8 @@ package qemu-$cpu interpreter $qemu magic $magic mask $mask +credential $CREDENTIAL EOF - if [ "$FLAGS" = "OC" ] ; then - echo "credentials yes" >> "$EXPORTDIR/qemu-$cpu" - fi } qemu_set_binfmts() { @@ -300,7 +303,7 @@ SYSTEMDDIR="/etc/binfmt.d" DEBIANDIR="/usr/share/binfmts" QEMU_PATH=/usr/local/bin -FLAGS="" +CREDENTIAL=no options=$(getopt -o ds:Q:e:hc: -l debian,systemd:,qemu-path:,exportdir:,help,credential: -- "$@") eval set -- "$options" @@ -348,11 +351,7 @@ while true ; do ;; -c|--credential) shift - if [ "$1" = "yes" ] ; then - FLAGS="OC" - else - FLAGS="" - fi + CREDENTIAL="$1" ;; *) break |