Dario Faggioli
2c8c706b6f
- Kill downstream patches around bifmt handling that makes cumbersome to run multi-arch containers, and switch to the upstream behavior, which is well documented and valid on all other distros. This is possible thanks to Linux kernel commit 2347961b11d4 and QEMU commit 6e1c0d7b951e19c53 (so it can only work on Leap/SLE 15.4 and higher). (bsc#1197298) * Patches dropped: qemu-binfmt-conf.sh-allow-overriding-SUS.patch qemu-binfmt-conf-use-qemu-ARCH-binfmt.patch OBS-URL: https://build.opensuse.org/request/show/964930 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=700
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Tue, 14 Sep 2021 14:10:58 -0300
|
|
Subject: =?UTF-8?q?qemu-binfmt-conf.sh=20should=20use=20"-F"=20as=20short?=
|
|
=?UTF-8?q?=20option=20for=20"--qemu-suffix".=0AFix=20the=20getopt=20call?=
|
|
=?UTF-8?q?=20to=20make=20this=20work.?=
|
|
|
|
Git-commit: 00000000000000000000000000000000000000000
|
|
References: bsc#1186256
|
|
|
|
Signed-off-by: Martin Wilck <mwilck@suse.com>
|
|
---
|
|
scripts/qemu-binfmt-conf.sh | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
|
|
index cb06245a834f9e8f2bb0464a25ce..53be2ba047fa3fba9d9b61030ab3 100755
|
|
--- a/scripts/qemu-binfmt-conf.sh
|
|
+++ b/scripts/qemu-binfmt-conf.sh
|
|
@@ -340,7 +340,7 @@ 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: -- "$@")
|
|
+options=$(getopt -o ds:Q:S:e:hc:p:g:F: -l debian,systemd:,qemu-path:,qemu-suffix:,exportdir:,help,credential:,persistent:,preserve-argv0: -- "$@")
|
|
eval set -- "$options"
|
|
|
|
while true ; do
|