diff options
author | Timothy DeHerrera <tim.deh@pm.me> | 2021-11-09 15:41:20 -0700 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-11-09 15:56:04 -0800 |
commit | 4d765caecdc91e6efa61822499f2275b59926dee (patch) | |
tree | 0add43fbe3a7222b778ec9ca71a6181ddcad5df6 /nixos/maintainers | |
parent | dbb930d03735344d626d6f7eb67e5467b40c1bc1 (diff) | |
download | nixlib-4d765caecdc91e6efa61822499f2275b59926dee.tar nixlib-4d765caecdc91e6efa61822499f2275b59926dee.tar.gz nixlib-4d765caecdc91e6efa61822499f2275b59926dee.tar.bz2 nixlib-4d765caecdc91e6efa61822499f2275b59926dee.tar.lz nixlib-4d765caecdc91e6efa61822499f2275b59926dee.tar.xz nixlib-4d765caecdc91e6efa61822499f2275b59926dee.tar.zst nixlib-4d765caecdc91e6efa61822499f2275b59926dee.zip |
create_amis.sh: fix logic for non-zfs amis
Diffstat (limited to 'nixos/maintainers')
-rwxr-xr-x | nixos/maintainers/scripts/ec2/create-amis.sh | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 712d9b548ff0..355894587391 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -65,13 +65,18 @@ read_image_info() { # We handle a single image per invocation, store all attributes in # globals for convenience. 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_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) ) fi @@ -192,7 +197,7 @@ upload_image() { for image_file in "${image_files[@]}"; do local aws_path=${image_file#/} - if [[ -n "$zfs_disks" ]]; then + if [[ -n "$is_zfs_image" ]]; then local suffix=${image_file%.*} suffix=${suffix##*.} fi @@ -239,7 +244,7 @@ upload_image() { "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_image_logical_bytes=$(read_image_info ".disks.root.logical_bytes") |