diff options
| author | Timothy DeHerrera <tim.deh@pm.me> | 2021-09-22 16:39:58 -0600 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-10-03 19:03:28 -0700 |
| commit | 1c0a20efcfdb40d7a08078e436baade866f83b0f (patch) | |
| tree | 0b85a45bcc9f60f6decae186a53d714726728bb6 | |
| parent | 2d67b946b7a065dfae76f77e6da810ac022f99bd (diff) | |
| download | nixpkgs-1c0a20efcfdb40d7a08078e436baade866f83b0f.tar nixpkgs-1c0a20efcfdb40d7a08078e436baade866f83b0f.tar.gz nixpkgs-1c0a20efcfdb40d7a08078e436baade866f83b0f.tar.bz2 nixpkgs-1c0a20efcfdb40d7a08078e436baade866f83b0f.tar.lz nixpkgs-1c0a20efcfdb40d7a08078e436baade866f83b0f.tar.xz nixpkgs-1c0a20efcfdb40d7a08078e436baade866f83b0f.tar.zst nixpkgs-1c0a20efcfdb40d7a08078e436baade866f83b0f.zip | |
create-amis.sh: fix typo
| -rw-r--r-- | nixos/maintainers/scripts/ec2/amazon-image.nix | 4 | ||||
| -rwxr-xr-x | nixos/maintainers/scripts/ec2/create-amis.sh | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 6942b58f236..e5aca9fe20f 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -104,8 +104,8 @@ in { ${pkgs.jq}/bin/jq -n \ --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ - --arg root_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ - --arg boot_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg root_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg boot_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ --arg root "$rootDisk" \ --arg boot "$bootDisk" \ '{} diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index ee5019413a1..712d9b548ff 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -69,7 +69,7 @@ image_label="$(read_image_info .label)${zfs_disks:+-ZFS}" image_system=$(read_image_info .system) image_files=( $(read_image_info "${zfs_disks:+.disks.root}.file") ) -image_logical_bytes=$(read_image_info "${zfs_disks:+.disks.root}.logical_bytes") +image_logical_bytes=$(read_image_info "${zfs_disks:+.disks.boot}.logical_bytes") if [[ -n "$zfs_disks" ]]; then image_files+=( $(read_image_info .disks.boot.file) ) @@ -242,10 +242,7 @@ upload_image() { if [[ -n "$zfs_disks" ]]; then local root_snapshot_id=$(read_state "$region.$image_label.root.$image_system" snapshot_id) - # currently there is a bug in the ZFS AMI derivation, mismatching logical_bytes - # root.logical_bytes should be boot.logical_bytes and vice versa - # work around until fixed - local root_image_logical_bytes=$(read_image_info ".disks.boot.logical_bytes") + local root_image_logical_bytes=$(read_image_info ".disks.root.logical_bytes") local root_image_logical_gigabytes=$(((root_image_logical_bytes-1)/1024/1024/1024+1)) # Round to the next GB block_device_mappings+=( |