Unverified Commit 386c037c authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #284174 from jmbaur/repart-sector-size

Fix appliance-repart-image NixOS VM test
parents 6446f962 0bf5f3be
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@
, split
, seed
, definitionsDirectory
, sectorSize
}:

let
@@ -94,6 +95,7 @@ runCommand imageFileBasename
    --definitions="$amendedRepartDefinitions" \
    --split="${lib.boolToString split}" \
    --json=pretty \
    ${lib.optionalString (sectorSize != null) "--sector-size=${toString sectorSize}"} \
    ${imageFileBasename}.raw \
    | tee repart-output.json

+11 −1
Original line number Diff line number Diff line
@@ -135,6 +135,16 @@ in
      '';
    };

    sectorSize = lib.mkOption {
      type = with lib.types; nullOr int;
      default = 512;
      example = lib.literalExpression "4096";
      description = lib.mdDoc ''
        The sector size of the disk image produced by systemd-repart. This
        value must be a power of 2 between 512 and 4096.
      '';
    };

    package = lib.mkPackageOption pkgs "systemd-repart" {
      # We use buildPackages so that repart images are built with the build
      # platform's systemd, allowing for cross-compiled systems to work.
@@ -232,7 +242,7 @@ in
      in
      pkgs.callPackage ./repart-image.nix {
        systemd = cfg.package;
        inherit (cfg) imageFileBasename compression split seed;
        inherit (cfg) imageFileBasename compression split seed sectorSize;
        inherit fileSystems definitionsDirectory partitions;
      };

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ in

    image.repart = {
      name = "appliance-gpt-image";
      # OVMF does not work with the default repart sector size of 4096
      sectorSize = 512;
      partitions = {
        "esp" = {
          contents =