pyrox.dev / nixpkgs
lol
fork atom

create-amis.sh: fix typo

authored by

Timothy DeHerrera and committed by
Jonathan Ringer 1c0a20ef 2d67b946

+4 -7
+2 -2
nixos/maintainers/scripts/ec2/amazon-image.nix
··· 104 104 ${pkgs.jq}/bin/jq -n \ 105 105 --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ 106 106 --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ 107 - --arg root_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ 108 - --arg boot_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ 107 + --arg root_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ 108 + --arg boot_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ 109 109 --arg root "$rootDisk" \ 110 110 --arg boot "$bootDisk" \ 111 111 '{}
+2 -5
nixos/maintainers/scripts/ec2/create-amis.sh
··· 69 69 image_system=$(read_image_info .system) 70 70 image_files=( $(read_image_info "${zfs_disks:+.disks.root}.file") ) 71 71 72 - image_logical_bytes=$(read_image_info "${zfs_disks:+.disks.root}.logical_bytes") 72 + image_logical_bytes=$(read_image_info "${zfs_disks:+.disks.boot}.logical_bytes") 73 73 74 74 if [[ -n "$zfs_disks" ]]; then 75 75 image_files+=( $(read_image_info .disks.boot.file) ) ··· 242 242 if [[ -n "$zfs_disks" ]]; then 243 243 local root_snapshot_id=$(read_state "$region.$image_label.root.$image_system" snapshot_id) 244 244 245 - # currently there is a bug in the ZFS AMI derivation, mismatching logical_bytes 246 - # root.logical_bytes should be boot.logical_bytes and vice versa 247 - # work around until fixed 248 - local root_image_logical_bytes=$(read_image_info ".disks.boot.logical_bytes") 245 + local root_image_logical_bytes=$(read_image_info ".disks.root.logical_bytes") 249 246 local root_image_logical_gigabytes=$(((root_image_logical_bytes-1)/1024/1024/1024+1)) # Round to the next GB 250 247 251 248 block_device_mappings+=(