From 7080e2dce553d3121e00606821f2fb7acdfc63bb Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Mon, 31 Aug 2026 13:50:24 +0000 Subject: oci: T9265: add CPU architecture (fallback amd64) to image filename Generated OCI images are now named vyos--oci-.tar (e.g. vyos-1.5.1-oci-amd64.tar) so amd64 and arm64 artifacts no longer collide. The architecture is read from the ISO version.json, falling back to amd64 for older ISOs built before ARM64 support was added. --- scripts/iso-to-oci | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/iso-to-oci b/scripts/iso-to-oci index 255ded8b..f79c02a0 100755 --- a/scripts/iso-to-oci +++ b/scripts/iso-to-oci @@ -55,7 +55,8 @@ xorriso -osirrox on -indev "${ISO}" -extract /live/filesystem.squashfs "${ROOTFS echo "I: extracting squashfs content" unsquashfs -follow -dest "${UNSQUASHFS}/" "${ROOTFS}/live/filesystem.squashfs" >/dev/null 2>&1 VERSION="$(jq --raw-output .version "${ROOTFS}/version.json")" -ARCH="$(jq --raw-output .architecture "${ROOTFS}/version.json")" +# older ISOs predate ARM64 support and carry no architecture in version.json +ARCH="$(jq --raw-output '.architecture // "amd64"' "${ROOTFS}/version.json")" OCI_IMAGE="vyos-${VERSION}-oci-${ARCH}.tar" # fix locales for correct system configuration loading -- cgit v1.2.3