Skip to content

s390x: build bare metal DASD image #779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jlebon merged 1 commit into from
Sep 26, 2019
Merged

s390x: build bare metal DASD image #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/cmd-buildextend-dasd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cmd-buildextend-metal
15 changes: 12 additions & 3 deletions src/cmd-buildextend-metal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ dn=$(dirname "$0")
# image (qemu). `buildextend-qemu` is a symlink to `buildextend-metal`.
case "$(basename "$0")" in
"cmd-buildextend-metal") image_type=metal;;
"cmd-buildextend-dasd") image_type=dasd;;
"cmd-buildextend-qemu") image_type=qemu;;
*) fatal "called as unexpected name $0";;
esac
Expand Down Expand Up @@ -142,15 +143,17 @@ path=${PWD}/${img}

# For bare metal images, we estimate the disk size. For qemu, we get it from
# image.yaml.
if [[ $image_type == metal ]]; then
if [[ $image_type == metal || $image_type == dasd ]]; then
echo "Estimating disk size..."
/usr/lib/coreos-assembler/estimate-commit-disk-size --repo "$ostree_repo" "$ref" --add-percent 20 > "$PWD/tmp/ostree-size.json"
size="$(jq '."estimate-mb".final' "$PWD/tmp/ostree-size.json")"
# extra size is the non-ostree partitions, see create_disk.sh
size="$(( size + 513 ))M"
echo "Disk size estimated to $size"
ignition_platform_id="metal"
else
size="$(python3 -c 'import sys, yaml; print(yaml.safe_load(sys.stdin)["size"])' < "$configdir/image.yaml")G"
ignition_platform_id="$image_type"
fi

kargs="$(python3 -c 'import sys, yaml; args = yaml.safe_load(sys.stdin).get("extra-kargs", []); print(" ".join(args))' < "$configdir/image.yaml")"
Expand All @@ -159,7 +162,7 @@ tty="console=tty0 console=${DEFAULT_TERMINAL},115200n8"
if [ "$arch" == "s390x" ]; then
tty="console=${DEFAULT_TERMINAL}"
fi
kargs="$kargs $tty ignition.platform.id=$image_type"
kargs="$kargs $tty ignition.platform.id=$ignition_platform_id"

ostree_remote="$(python3 -c 'import sys, yaml; print(yaml.safe_load(sys.stdin).get("ostree-remote", "NONE"))' < "$configdir/image.yaml")"
save_var_subdirs="$(python3 -c 'import sys, yaml; print(yaml.safe_load(sys.stdin).get("save-var-subdirs-for-selabel-workaround", "NONE"))' < "$configdir/image.yaml")"
Expand All @@ -172,7 +175,13 @@ if [ -z "${use_anaconda}" ]; then
if [ -n "${ref_is_temp}" ]; then
ref_arg=${commit}
fi
runvm -drive "if=virtio,id=target,format=${image_format},file=${path}.tmp" -- \
target_drive=("-drive" "if=virtio,id=target,format=${image_format},file=${path}.tmp")
if [[ $image_format == raw && $image_type == dasd ]]; then
target_drive=("-drive" "if=none,id=target,format=${image_format},file=${path}.tmp" \
# we need 4096 block size for ECKD DASD
"-device" "virtio-blk-ccw,drive=target,physical_block_size=4096,logical_block_size=4096,scsi=off")
fi
runvm "${target_drive[@]}" -- \
/usr/lib/coreos-assembler/create_disk.sh \
--disk /dev/vda \
--buildid "${build}" \
Expand Down