diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2019-05-25 18:53:15 +0900 |
|---|---|---|
| committer | Andrew Childs <lorne@cons.org.nz> | 2019-09-05 00:52:17 +0900 |
| commit | 5501274b5f2f53ca27775cb4ff958b131afb80de (patch) | |
| tree | 37da41e3f4760ae8403d9d5022bbbab6e51a1e84 /nixos/maintainers/scripts/ec2/amazon-image.nix | |
| parent | e3fbbb1d108988069383a78f424463e6be087707 (diff) | |
| download | nixpkgs-5501274b5f2f53ca27775cb4ff958b131afb80de.tar nixpkgs-5501274b5f2f53ca27775cb4ff958b131afb80de.tar.gz nixpkgs-5501274b5f2f53ca27775cb4ff958b131afb80de.tar.bz2 nixpkgs-5501274b5f2f53ca27775cb4ff958b131afb80de.tar.lz nixpkgs-5501274b5f2f53ca27775cb4ff958b131afb80de.tar.xz nixpkgs-5501274b5f2f53ca27775cb4ff958b131afb80de.tar.zst nixpkgs-5501274b5f2f53ca27775cb4ff958b131afb80de.zip | |
amazon-image.nix: add EFI support, enable by default for aarch64
Diffstat (limited to 'nixos/maintainers/scripts/ec2/amazon-image.nix')
| -rw-r--r-- | nixos/maintainers/scripts/ec2/amazon-image.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 88d95e67544..f17a56d8c8d 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -51,7 +51,9 @@ in { inherit lib config; inherit (cfg) contents format name; pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package - partitionTableType = if config.ec2.hvm then "legacy" else "none"; + partitionTableType = if config.ec2.efi then "efi" + else if config.ec2.hvm then "legacy" + else "none"; diskSize = cfg.sizeMB; fsType = "ext4"; configFile = pkgs.writeText "configuration.nix" @@ -61,6 +63,9 @@ in { ${optionalString config.ec2.hvm '' ec2.hvm = true; ''} + ${optionalString config.ec2.efi '' + ec2.efi = true; + ''} } ''; }; |