Merge pull request #57633 from talyz/master

amazon-image.nix: Resolve failure to include resize2fs
2019-03-16 05:12:05 +01:00 · 2019-03-16 05:12:05 +01:00 · 056b9d0085
commit 056b9d0085
parent 54ce13ee84 261372b69c
2 changed files with 2 additions and 0 deletions
--- 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"
      ''
        {
--- 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;
    };