Unverified Commit 8a7d644c authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

{amazon,sd,disk-image,openstack}-image: Fix image.filePath, image.extensions (#409571)

parents e0327a1c b033e0c4
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ in

  config.system.nixos.tags = [ "amazon" ];
  config.system.build.image = config.system.build.amazonImage;
  config.image.extension = cfg.format;
  config.image.extension = if cfg.format == "vpc" then "vhd" else cfg.format;

  config.system.build.amazonImage =
    let
+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ in
      postVM = ''
         extension=''${rootDiskImage##*.}
         friendlyName=$out/${config.image.baseName}
         rootDisk="$friendlyName.root.$extension"
         rootDisk="$friendlyName.$extension"
         mv "$rootDiskImage" "$rootDisk"

         mkdir -p $out/nix-support
+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ in
    sdImage.storePaths = [ config.system.build.toplevel ];

    image.extension = if config.sdImage.compressImage then "img.zst" else "img";
    image.filePath = "sd-card/${config.image.fileName}";
    image.filePath = "sd-image/${config.image.fileName}";
    system.nixos.tags = [ "sd-card" ];
    system.build.image = config.system.build.sdImage;
    system.build.sdImage = pkgs.callPackage (
+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ in
    };

    system.nixos.tags = [ cfg.format ] ++ lib.optionals cfg.efiSupport [ "efi" ];
    image.extension = cfg.format;
    image.extension = if cfg.format == "raw" then "img" else cfg.format;
    system.build.image = import ../../lib/make-disk-image.nix {
      inherit lib config pkgs;
      inherit (config.virtualisation) diskSize;