Skip to content

Commit

Permalink
Remove obsolete create_disk.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
nikita-dubrovskii committed Jul 1, 2024
1 parent cb67226 commit e5ec67b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 644 deletions.
17 changes: 3 additions & 14 deletions src/cmd-buildextend-metal
Original file line number Diff line number Diff line change
Expand Up @@ -246,14 +246,13 @@ cat >"${image_dynamic_yaml}" << EOF
buildid: "${build}"
imgid: "${img}"
ostree-commit: "${commit}"
# Used by both create_disk.sh and runvm-osbuild
# Used by runvm-osbuild
container-imgref: "${container_imgref}"
deploy-via-container: "${deploy_via_container}"
osname: "${name}"
ostree-container: "${ostree_container}"
ostree-ref: "${ref}"
extra-kargs-string: "${extra_kargs}"
# Used by runvm-osbuild
image-type: "${image_type}"
ostree-repo: "${ostree_repo}"
metal-image-size: "${metal_image_size_mb}"
Expand Down Expand Up @@ -287,18 +286,8 @@ if [ "${OSBUILD_SUPPORTED:-}" != "" ] && [ "${COSA_USE_OSBUILD:-}" != "0" ]; the
--mpp "/usr/lib/coreos-assembler/osbuild-manifests/coreos.osbuild.${basearch}.mpp.yaml" \
--filepath "${path}.tmp" "${osbuild_extra_args[@]}"
else
runvm "${qemu_args[@]}" -- \
/usr/lib/coreos-assembler/create_disk.sh \
--config "${image_for_disk_json}" \
--platform "${ignition_platform_id}" \
--platforms-json "${platforms_json}" \
"${disk_args[@]}"

# Now that we've created the image let's resize it to the desired
# size for qemu (and all images based on it).
if [[ $image_type == qemu ]]; then
qemu-img resize "${path}.tmp" "${cloud_image_size_mb}M"
fi
echo "OSBUILD_SUPPORTED is not supported or COSA_USE_OSBUILD is unset"
exit 1
fi

if [[ $secure_execution -eq "1" ]]; then
Expand Down
Loading

0 comments on commit e5ec67b

Please sign in to comment.