From 261372b69c69134944add26bd4e9a58c9570ab73 Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 14 Mar 2019 10:30:20 +0100 Subject: [PATCH] amazon-image.nix: Resolve failure to include resize2fs Since 34234dcb511, for resize2fs to be automatically included in initrd, a filesystem needed for boot must be explicitly defined as an ext* type filesystem. --- nixos/maintainers/scripts/ec2/amazon-image.nix | 1 + nixos/modules/virtualisation/amazon-image.nix | 1 + 2 files changed, 2 insertions(+) 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; };