movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

create_amis.sh: fix logic for non-zfs amis

Browse source
This commit is contained in:
Timothy DeHerrera 2021-11-09 15:41:20 -07:00 • committed by Jonathan Ringer
parent dbb930d037
commit 4d765caecd
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
nixos/maintainers/scripts/ec2/create-amis.sh
View file

@ -65,13 +65,18 @@ read_image_info() {
# We handle a single image per invocation, store all attributes in # We handle a single image per invocation, store all attributes in
# globals for convenience. # globals for convenience.
zfs_disks=$(read_image_info .disks) zfs_disks=$(read_image_info .disks)
image_label="$(read_image_info .label)${zfs_disks:+-ZFS}" is_zfs_image=
if jq -e .boot <<< "$zfs_disks"; then
is_zfs_image=1
zfs_boot=".disks.boot"
fi
image_label="$(read_image_info .label)${is_zfs_image:+-ZFS}"
image_system=$(read_image_info .system) image_system=$(read_image_info .system)
image_files=( $(read_image_info "${zfs_disks:+.disks.root}.file") ) image_files=( $(read_image_info ".disks.root.file") )
image_logical_bytes=$(read_image_info "${zfs_disks:+.disks.boot}.logical_bytes") image_logical_bytes=$(read_image_info "${zfs_boot:-.disks.root}.logical_bytes")
if [[ -n "$zfs_disks" ]]; then if [[ -n "$is_zfs_image" ]]; then
image_files+=( $(read_image_info .disks.boot.file) ) image_files+=( $(read_image_info .disks.boot.file) )
fi fi
@ -192,7 +197,7 @@ upload_image() {
for image_file in "${image_files[@]}"; do for image_file in "${image_files[@]}"; do
local aws_path=${image_file#/} local aws_path=${image_file#/}
if [[ -n "$zfs_disks" ]]; then if [[ -n "$is_zfs_image" ]]; then
local suffix=${image_file%.*} local suffix=${image_file%.*}
suffix=${suffix##*.} suffix=${suffix##*.}
fi fi
@ -239,7 +244,7 @@ upload_image() {
"DeviceName=/dev/xvda,Ebs={SnapshotId=$snapshot_id,VolumeSize=$image_logical_gigabytes,DeleteOnTermination=true,VolumeType=gp3}" "DeviceName=/dev/xvda,Ebs={SnapshotId=$snapshot_id,VolumeSize=$image_logical_gigabytes,DeleteOnTermination=true,VolumeType=gp3}"
) )
if [[ -n "$zfs_disks" ]]; then if [[ -n "$is_zfs_image" ]]; then
local root_snapshot_id=$(read_state "$region.$image_label.root.$image_system" snapshot_id) local root_snapshot_id=$(read_state "$region.$image_label.root.$image_system" snapshot_id)
local root_image_logical_bytes=$(read_image_info ".disks.root.logical_bytes") local root_image_logical_bytes=$(read_image_info ".disks.root.logical_bytes")