Merge master into staging-next

2021-03-28 18:14:11 +00:00
parent 25268aeaf7 93ad9f20ed
commit b9456ca263
335 changed files with 2578 additions and 1894 deletions
@@ -386,7 +386,7 @@ let
          ) config.boot.initrd.secrets)
         }

-        (cd "$tmp" && find . -print0 | sort -z | cpio -o -H newc -R +0:+0 --reproducible --null) | \
+        (cd "$tmp" && find . -print0 | sort -z | cpio --quiet -o -H newc -R +0:+0 --reproducible --null) | \
          ${compressorExe} ${lib.escapeShellArgs initialRamdisk.compressorArgs} >> "$1"
      '';