+105
nixos/lib/make-disk-image.nix
+105
nixos/lib/make-disk-image.nix
···
···
-5
nixos/maintainers/scripts/ec2/amazon-base-config.nix
-5
nixos/maintainers/scripts/ec2/amazon-base-config.nix
-5
nixos/maintainers/scripts/ec2/amazon-hvm-config.nix
-5
nixos/maintainers/scripts/ec2/amazon-hvm-config.nix
-34
nixos/maintainers/scripts/ec2/amazon-hvm-install-config.nix
-34
nixos/maintainers/scripts/ec2/amazon-hvm-install-config.nix
···
···
+27
nixos/maintainers/scripts/ec2/amazon-image.nix
+27
nixos/maintainers/scripts/ec2/amazon-image.nix
···
···
+217
nixos/maintainers/scripts/ec2/create-amis.sh
+217
nixos/maintainers/scripts/ec2/create-amis.sh
···
···+--arg configuration "{ imports = [ <nixpkgs/nixos/maintainers/scripts/ec2/amazon-image.nix> ]; ec2.hvm = $hvmFlag; }"+#for region in eu-west-1 eu-central-1 us-east-1 us-west-1 us-west-2 ap-southeast-1 ap-southeast-2 ap-northeast-1 sa-east-1; do+volId=$(ec2-describe-conversion-tasks "$taskId" --region "$region" | sed 's/.*VolumeId.*\(vol-[0-9a-f]\+\).*/\1/ ; t ; d')+ec2-delete-disk-image -t "$taskId" --region "$region" -o "$EC2_ACCESS_KEY" -w "$EC2_SECRET_KEY" || true+extraFlags+=" -b /dev/sdb=ephemeral0 -b /dev/sdc=ephemeral1 -b /dev/sdd=ephemeral2 -b /dev/sde=ephemeral3"+kernel=$(ec2-describe-images -o amazon --filter "manifest-location=*pv-grub-hd0_1.04-$arch*" --region "$region" | cut -f 2)
-216
nixos/maintainers/scripts/ec2/create-ebs-amis.py
-216
nixos/maintainers/scripts/ec2/create-ebs-amis.py
···-parser.add_argument('--region', dest='region', required=True, help='EC2 region to create the image in')-parser.add_argument('--keep', dest='keep', action='store_true', help='Keep NixOps machine after use')-parser.add_argument('--key', dest='key_name', action='store_true', help='Keypair used for HVM instance creation', default="rob")-depl.nix_exprs = [os.path.abspath("./ebs-creator.nix"), os.path.abspath("./ebs-creator-config.nix")]-m.run_command("nix-channel --add https://nixos.org/channels/nixos-{} nixos".format(args.channel))-version = m.run_command("nix-instantiate --eval-only -A lib.nixpkgsVersion '<nixpkgs>'", capture_stdout=True).split(' ')[0].replace('"','').strip()-m.upload_file("./amazon-hvm-install-config.nix", "/mnt/etc/nixos/amazon-hvm-install-config.nix")-volume = m._conn.get_all_volumes([], filters={'attachment.instance-id': m.resource_id, 'attachment.device': "/dev/sdg"})[0]-aki = m._conn.get_all_images(filters={'manifest-location': 'ec2*pv-grub-hd0_1.03-x86_64*'})[0]-block_map[root_block] = BlockDeviceType(snapshot_id=snapshot.id, delete_on_termination=True, size=ebs_size, volume_type="gp2")-for dest in [ 'us-east-1', 'us-west-1', 'us-west-2', 'eu-west-1', 'eu-central-1', 'ap-southeast-1', 'ap-southeast-2', 'ap-northeast-1', 'sa-east-1']:-copy_image = conn.copy_image(args.region, ami_id, ami_name, description=None, client_token=None)-f.write(' "{0}"."{1}".{2} = "{3}";\n'.format(args.channel,dest,"hvm" if args.hvm else "ebs",copy_image.image_id))-f.write(' "{0}"."{1}".{2} = "{3}";\n'.format(args.channel,args.region,"hvm" if args.hvm else "ebs",ami_id))
···
-53
nixos/maintainers/scripts/ec2/create-s3-amis.sh
-53
nixos/maintainers/scripts/ec2/create-s3-amis.sh
···-version=$(nix-instantiate --eval-only '<nixpkgs/nixos>' -A config.system.nixosVersion | sed s/'"'//g)-kernel=$(ec2-describe-images -o amazon --filter "manifest-location=*pv-grub-hd0_1.04-$arch*" --region "$region" | cut -f 2)-ami=$(ec2-register "$bucket/nixos.img.manifest.xml" -n "$name" -d "NixOS $system r$revision" -O "$EC2_ACCESS_KEY" -W "$EC2_SECRET_KEY" \-ec2-modify-image-attribute --region "$region" "$ami" -l -a all -O "$EC2_ACCESS_KEY" -W "$EC2_SECRET_KEY"-for cp_region in us-east-1 us-west-1 us-west-2 eu-central-1 ap-southeast-1 ap-southeast-2 ap-northeast-1 sa-east-1; do-new_ami=$(aws ec2 copy-image --source-image-id $ami --source-region $region --region $cp_region --name "$name" | json ImageId)
···
-13
nixos/maintainers/scripts/ec2/ebs-creator.nix
-13
nixos/maintainers/scripts/ec2/ebs-creator.nix
···
···
-3
nixos/modules/virtualisation/amazon-config.nix
-3
nixos/modules/virtualisation/amazon-config.nix
+47
nixos/modules/virtualisation/amazon-grow-partition.nix
+47
nixos/modules/virtualisation/amazon-grow-partition.nix
···
···
+15
-82
nixos/modules/virtualisation/amazon-image.nix
+15
-82
nixos/modules/virtualisation/amazon-image.nix
···
···
+88
nixos/modules/virtualisation/growpart-util-linux-2.26.patch
+88
nixos/modules/virtualisation/growpart-util-linux-2.26.patch
···
···