[Qemu-devel] [PATCH v4 5/10] qemu-binfmt-conf.sh: remove 'qemu' prefix from cli options

[Unai Martinez-Corral]

This breaks backward compatibility.

Options 'qemu-path' and 'qemu-suffix' have the 'qemu-' prefix, which is
not present in other option names ('debian', 'systemd', 'persistent',
'credential'...). In order to keep consistency, the prefix is removed.

Signed-off-by: Unai Martinez-Corral <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
---
 scripts/qemu-binfmt-conf.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
index 489d7d2326..0918f7fba6 100755
--- a/scripts/qemu-binfmt-conf.sh
+++ b/scripts/qemu-binfmt-conf.sh
@@ -167,6 +167,7 @@ qemu_get_family() {

 usage() {
     cat <<EOF
+
 Usage: qemu-binfmt-conf.sh [options]

 Configure binfmt_misc to use qemu interpreter
@@ -175,8 +176,8 @@ Options and associated environment variables:

 Argument             Env-variable     Description
 -h|--help                             display this usage
--Q|--qemu-path PATH: QEMU_PATH        set path to qemu interpreter
--F|--qemu-suffix SUFFIX:              add a suffix to the default interpreter 
name
+-Q|--path PATH:      QEMU_PATH        set path to qemu interpreter(s)
+-F|--suffix 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",
@@ -324,7 +325,7 @@ QEMU_PERSISTENT="${QEMU_PERSISTENT:-no}"

 QEMU_SUFFIX=""

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

 while true ; do
@@ -356,11 +357,11 @@ while true ; do
             fi
         fi
         ;;
-    -Q|--qemu-path)
+    -Q|--path)
         shift
         QEMU_PATH="$1"
         ;;
-    -F|--qemu-suffix)
+    -F|--suffix)
         shift
         QEMU_SUFFIX="$1"
         ;;
--
2.21.0