Commit 3bb83bd1 authored by phaer's avatar phaer
Browse files

modules/image/repart: repart.imageFile(Basename) -> image.baseName 

Rename remaining uses of renamed option repart.imageFileBasename to
image.baseName.

Follow up to https://github.com/NixOS/nixpkgs/pull/401872
Removes a warning when using repart-verity-store.nix.
parent a9f59fae

nixos/modules/image/repart-image.nix

+4 −4
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
  # arguments

  name,

  version,

  imageFileBasename,

  baseName,

  compression,

  fileSystems,

  finalPartitions,
@@ -205,7 +205,7 @@ stdenvNoCC.mkDerivation ( 
      echo "Building image with systemd-repart..."

      unshare --map-root-user fakeroot systemd-repart \

        ''${systemdRepartFlags[@]} \

        ${imageFileBasename}.raw \

        ${baseName}.raw \

        | tee repart-output.json



      runHook postBuild
@@ -220,14 +220,14 @@ stdenvNoCC.mkDerivation ( 
    # separate derivation to allow users to save disk space. Disk images are

    # already very space intensive so we want to allow users to mitigate this.

    + lib.optionalString compression.enable ''

      for f in ${imageFileBasename}*; do

      for f in ${baseName}*; do

        echo "Compressing $f with ${compression.algorithm}..."

        # Keep the original file when compressing and only delete it afterwards

        ${compressionCommand} $f && rm $f

      done

    ''

    + ''

      mv -v repart-output.json ${imageFileBasename}* $out

      mv -v repart-output.json ${baseName}* $out



      runHook postInstall

    '';

nixos/modules/image/repart-verity-store.nix

+2 −2
Original line number Diff line number Diff line
@@ -194,8 +194,8 @@ in 
                  | assert_uki_repart_match.py "${config.system.build.intermediateImage}/repart-output.json"



                # copy the uncompressed intermediate image, so that systemd-repart picks it up

                cp -v ${config.system.build.intermediateImage}/${config.image.repart.imageFileBasename}.raw .

                chmod +w ${config.image.repart.imageFileBasename}.raw

                cp -v ${config.system.build.intermediateImage}/${config.image.baseName}.raw .

                chmod +w ${config.image.baseName}.raw

              '';



              # replace "TBD" with the original roothash values

nixos/modules/image/repart.nix

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ in 
        mkfsEnv = mkfsOptionsToEnv cfg.mkfsOptions;

        val = pkgs.callPackage ./repart-image.nix {

          systemd = cfg.package;

          imageFileBasename = config.image.baseName;

          inherit (config.image) baseName;

          inherit (cfg)

            name

            version