Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

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.

phaer 3bb83bd1 a9f59fae

+7 -7
+4 -4
nixos/modules/image/repart-image.nix
··· 30 30 # arguments 31 31 name, 32 32 version, 33 - imageFileBasename, 33 + baseName, 34 34 compression, 35 35 fileSystems, 36 36 finalPartitions, ··· 205 205 echo "Building image with systemd-repart..." 206 206 unshare --map-root-user fakeroot systemd-repart \ 207 207 ''${systemdRepartFlags[@]} \ 208 - ${imageFileBasename}.raw \ 208 + ${baseName}.raw \ 209 209 | tee repart-output.json 210 210 211 211 runHook postBuild ··· 220 220 # separate derivation to allow users to save disk space. Disk images are 221 221 # already very space intensive so we want to allow users to mitigate this. 222 222 + lib.optionalString compression.enable '' 223 - for f in ${imageFileBasename}*; do 223 + for f in ${baseName}*; do 224 224 echo "Compressing $f with ${compression.algorithm}..." 225 225 # Keep the original file when compressing and only delete it afterwards 226 226 ${compressionCommand} $f && rm $f 227 227 done 228 228 '' 229 229 + '' 230 - mv -v repart-output.json ${imageFileBasename}* $out 230 + mv -v repart-output.json ${baseName}* $out 231 231 232 232 runHook postInstall 233 233 '';
+2 -2
nixos/modules/image/repart-verity-store.nix
··· 194 194 | assert_uki_repart_match.py "${config.system.build.intermediateImage}/repart-output.json" 195 195 196 196 # copy the uncompressed intermediate image, so that systemd-repart picks it up 197 - cp -v ${config.system.build.intermediateImage}/${config.image.repart.imageFileBasename}.raw . 198 - chmod +w ${config.image.repart.imageFileBasename}.raw 197 + cp -v ${config.system.build.intermediateImage}/${config.image.baseName}.raw . 198 + chmod +w ${config.image.baseName}.raw 199 199 ''; 200 200 201 201 # replace "TBD" with the original roothash values
+1 -1
nixos/modules/image/repart.nix
··· 391 391 mkfsEnv = mkfsOptionsToEnv cfg.mkfsOptions; 392 392 val = pkgs.callPackage ./repart-image.nix { 393 393 systemd = cfg.package; 394 - imageFileBasename = config.image.baseName; 394 + inherit (config.image) baseName; 395 395 inherit (cfg) 396 396 name 397 397 version