Unverified Commit 326702f8 authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

Use mkImageMediaOverride for filesystem attributes of various images (#397330)

parents ab829c99 5bd99195

nixos/modules/installer/sd-card/sd-image.nix

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ in 
  config = {

    hardware.enableAllHardware = true;



    fileSystems = {

    fileSystems = lib.mkImageMediaOverride {

      "/boot/firmware" = {

        device = "/dev/disk/by-label/${config.sdImage.firmwarePartitionName}";

        fsType = "vfat";

nixos/modules/virtualisation/azure-image.nix

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ in 
      '';

    };



    fileSystems = {

    fileSystems = lib.mkImageMediaOverride {

      "/" = {

        device = "/dev/disk/by-label/${cfg.label}";

        inherit (cfg) label;

nixos/modules/virtualisation/digital-ocean-config.nix

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ with lib; 
    in

    mkMerge [

      {

        fileSystems."/" = lib.mkDefault {

        fileSystems."/" = lib.mkImageMediaOverride {

          device = "/dev/disk/by-label/nixos";

          autoResize = true;

          fsType = "ext4";

nixos/modules/virtualisation/disk-image.nix

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ in 
    boot.loader.systemd-boot.enable = lib.mkDefault cfg.efiSupport;

    boot.growPartition = lib.mkDefault true;



    fileSystems = {

    fileSystems = lib.mkImageMediaOverride {

      "/" = {

        device = "/dev/disk/by-label/nixos";

        autoResize = true;

nixos/modules/virtualisation/google-compute-config.nix

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ in 
    ../profiles/qemu-guest.nix

  ];



  fileSystems."/" = {

  fileSystems."/" = lib.mkImageMediaOverride {

    fsType = "ext4";

    device = "/dev/disk/by-label/nixos";

    autoResize = true;