commit fdb144fb411b31aa2829d00ccfc9ddafe3ccd0f6 · pyrox.dev/nixpkgs

+22 -14

nixos/maintainers/scripts/ec2/amazon-image.nix

···

       20
       20
        
         imports = [

     

       21
       21
        
           ../../../modules/virtualisation/amazon-image.nix

     

       22
       22
        
           ../../../modules/virtualisation/disk-size-option.nix

     

       23
       23
       +
           ../../../modules/image/file-options.nix

     

       23
       24
        
           (lib.mkRenamedOptionModuleWith {

     

       24
       25
        
             sinceRelease = 2411;

     

       25
       26
        
             from = [

     
···

       31
       32
        
               "diskSize"

     

       32
       33
        
             ];

     

       33
       34
        
           })

     

       35
       35
       +
           (lib.mkRenamedOptionModuleWith {

     

       36
       36
       +
             sinceRelease = 2505;

     

       37
       37
       +
             from = [

     

       38
       38
       +
               "amazonImage"

     

       39
       39
       +
               "name"

     

       40
       40
       +
             ];

     

       41
       41
       +
             to = [

     

       42
       42
       +
               "image"

     

       43
       43
       +
               "baseName"

     

       44
       44
       +
             ];

     

       45
       45
       +
           })

     

       34
       46
        
         ];

     

       35
       47
        
       

     

       36
       48
        
         # Amazon recommends setting this to the highest possible value for a good EBS

     
···

       44
       56
        
           [ "nvme_core.io_timeout=${timeout}" ];

     

       45
       57
        
       

     

       46
       58
        
         options.amazonImage = {

     

       47
       47
       -
           name = mkOption {

     

       48
       48
       -
             type = types.str;

     

       49
       49
       -
             description = "The name of the generated derivation";

     

       50
       50
       -
             default = "nixos-amazon-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}";

     

       51
       51
       -
           };

     

       52
       52
       -
       

     

       53
       59
        
           contents = mkOption {

     

       54
       60
        
             example = literalExpression ''

     

       55
       61
        
               [ { source = pkgs.memtest86 + "/memtest.bin";

     
···

       80
       86
        
         config.virtualisation.diskSize = lib.mkOverride 1490 (3 * 1024);

     

       81
       87
        
         config.virtualisation.diskSizeAutoSupported = !config.ec2.zfs.enable;

     

       82
       88
        
       

     

       89
       89
       +
         config.system.nixos.tags = [ "amazon" ];

     

       90
       90
       +
         config.system.build.image = config.system.build.amazonImage;

     

       91
       91
       +
         config.image.extension = cfg.format;

     

       92
       92
       +
       

     

       83
       93
        
         config.system.build.amazonImage =

     

       84
       94
        
           let

     

       85
       95
        
             configFile = pkgs.writeText "configuration.nix" ''

     
···

       102
       112
        
                 configFile

     

       103
       113
        
                 pkgs

     

       104
       114
        
                 ;

     

       105
       105
       -
               inherit (cfg) contents format name;

     

       115
       115
       +
               inherit (cfg) contents format;

     

       116
       116
       +
               name = config.image.baseName;

     

       106
       117
        
       

     

       107
       118
        
               includeChannel = true;

     

       108
       119
        
       

     
···

       118
       129
        
       

     

       119
       130
        
               postVM = ''

     

       120
       131
        
                  extension=''${rootDiskImage##*.}

     

       121
       121
       -
                  friendlyName=$out/${cfg.name}

     

       132
       132
       +
                  friendlyName=$out/${config.image.baseName}

     

       122
       133
        
                  rootDisk="$friendlyName.root.$extension"

     

       123
       134
        
                  bootDisk="$friendlyName.boot.$extension"

     

       124
       135
        
                  mv "$rootDiskImage" "$rootDisk"

     
···

       156
       167
        
                 pkgs

     

       157
       168
        
                 ;

     

       158
       169
        
       

     

       159
       159
       -
               inherit (cfg) contents format name;

     

       170
       170
       +
               inherit (cfg) contents format;

     

       171
       171
       +
               inherit (config.image) baseName;

     

       172
       172
       +
               name = config.image.baseName;

     

       160
       173
        
       

     

       161
       174
        
               fsType = "ext4";

     

       162
       175
        
               partitionTableType = if config.ec2.efi then "efi" else "legacy+gpt";

     
···

       164
       177
        
               inherit (config.virtualisation) diskSize;

     

       165
       178
        
       

     

       166
       179
        
               postVM = ''

     

       167
       167
       -
                  extension=''${diskImage##*.}

     

       168
       168
       -
                  friendlyName=$out/${cfg.name}.$extension

     

       169
       169
       -
                  mv "$diskImage" "$friendlyName"

     

       170
       170
       -
                  diskImage=$friendlyName

     

       171
       171
       -
       

     

       172
       180
        
                  mkdir -p $out/nix-support

     

       173
       181
        
                  echo "file ${cfg.format} $diskImage" >> $out/nix-support/hydra-build-products

     

       174
       182

+1 -1

nixos/tests/ec2.nix

···

       55
       55
        
             }

     

       56
       56
        
           ];

     

       57
       57
        
         }).config;

     

       58
       58
       -
         image = "${imageCfg.system.build.amazonImage}/${imageCfg.amazonImage.name}.qcow2";

     

       58
       58
       +
         image = "${imageCfg.system.build.amazonImage}/${imageCfg.image.imageFile}";

     

       59
       59
        
       

     

       60
       60
        
         sshKeys = import ./ssh-keys.nix pkgs;

     

       61
       61
        
         snakeOilPrivateKey = sshKeys.snakeOilPrivateKey.text;