From f87df2b0761b55b24a9317f7694e2225a29c981d Mon Sep 17 00:00:00 2001 From: tangbinzy Date: Wed, 23 Nov 2022 06:33:44 +0000 Subject: [PATCH 09/29] qemu-binfmt-conf.sh: fix -F option mainline inclusion commit 719fab3afad22f34f0c812a8956adc88ab3242ce category: bugfix ------------------------------------------------------------ qemu-binfmt-conf.sh should use "-F" as short option for "--qemu-suffix". Fix the getopt call to make this work. Fixes: 7155be7cda5c ("qemu-binfmt-conf.sh: allow to provide a suffix to the interpreter name") Signed-off-by: Martin Wilck Reviewed-by: Laurent Vivier Message-Id: <20211129135100.3934-1-mwilck@suse.com> Signed-off-by: Laurent Vivier Signed-off-by: tangbinzy --- scripts/qemu-binfmt-conf.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index 7de996d536..e9bfeb94d3 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -340,7 +340,9 @@ PERSISTENT=no PRESERVE_ARG0=no QEMU_SUFFIX="" -options=$(getopt -o ds:Q:S:e:hc:p:g: -l debian,systemd:,qemu-path:,qemu-suffix:,exportdir:,help,credential:,persistent:,preserve-argv0: -- "$@") +_longopts="debian,systemd:,qemu-path:,qemu-suffix:,exportdir:,help,credential:,\ +persistent:,preserve-argv0:" +options=$(getopt -o ds:Q:S:e:hc:p:g:F: -l ${_longopts} -- "$@") eval set -- "$options" while true ; do -- 2.27.0