Merge remote-tracking branch 'origin/2.2' into 3.0

# Conflicts:
#	Dockerfile
#	dev-requirements.txt
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/version.py
#	requirements.txt
This commit is contained in:
grossmj committed 2026-02-20 16:28:53 +08:00
commit c5b9f379fe
3 files changed
+28 -8

No files matched your search

+3 -1
View File
@@ -78,8 +78,10 @@ class Docker(BaseManager):
stderr=asyncio.subprocess.DEVNULL
)
stdout, _ = await proc.communicate()
if proc.returncode == 1:
if proc.returncode == 1 or "static" in busybox_exec:
# ldd returns 1 if the file is not a dynamic executable
# on Alpine/musl, ldd returns 0 even for static binaries,
# so also trust binaries named busybox-static or busybox.static
log.info(f"Installing busybox from '{busybox_path}' to '{dst_busybox}'")
shutil.copy2(busybox_path, dst_busybox, follow_symlinks=True)
return