diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2026-08-31 16:59:40 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-08-31 16:59:40 +0300 |
| commit | a0e175dc96016020b1e4b40cc6a50b66ef4dcf20 (patch) | |
| tree | e96607f1072333d742501c7b57fe855ecb423727 /scripts | |
| parent | a02be72903ac43a78b5fa0bbeaaac15e632205e7 (diff) | |
| parent | 7080e2dce553d3121e00606821f2fb7acdfc63bb (diff) | |
| download | vyos-build-a0e175dc96016020b1e4b40cc6a50b66ef4dcf20.tar.gz vyos-build-a0e175dc96016020b1e4b40cc6a50b66ef4dcf20.zip | |
Merge pull request #1284 from c-po/oci-command-hardening
oci: T9265: add CPU architecture (fallback amd64) to image filename
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/iso-to-oci | 3 |
1 files changed, 2 insertions, 1 deletions
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 |