diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2019-03-16 05:12:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-16 05:12:05 +0100 |
| commit | 056b9d0085ed02c4524bf206d0112685327f0eef (patch) | |
| tree | 1839d2ae89f34c706776a2e1a5091f6580f18e59 /nixos | |
| parent | 54ce13ee84f8ab3ce1d65ba6364351fcb700f2eb (diff) | |
| parent | 261372b69c69134944add26bd4e9a58c9570ab73 (diff) | |
Merge pull request #57633 from talyz/master
amazon-image.nix: Resolve failure to include resize2fs
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/maintainers/scripts/ec2/amazon-image.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/amazon-image.nix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index eeae27ede0f89..88d95e675447c 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -53,6 +53,7 @@ in { pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package partitionTableType = if config.ec2.hvm then "legacy" else "none"; diskSize = cfg.sizeMB; + fsType = "ext4"; configFile = pkgs.writeText "configuration.nix" '' { diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 6f4f99caa6f13..d67790702f1f6 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -31,6 +31,7 @@ in fileSystems."/" = { device = "/dev/disk/by-label/nixos"; + fsType = "ext4"; autoResize = true; }; |