diff options
| author | Artturi <Artturin@artturin.com> | 2022-04-21 20:51:35 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-21 20:51:35 +0300 |
| commit | 98ff3e401c67a92ef3bb0df7d9e4f0e07dfaffe9 (patch) | |
| tree | d3989f56acb4152ef2371fcce1ed6c2c16d7e2a8 /nixos/modules/system/boot/stage-1.nix | |
| parent | d9309f43b3f1c038140662e6a80bfb190547c7b4 (diff) | |
| parent | 7fd6cea253a27d3c0660a4c21774c9697a655661 (diff) | |
| download | nixpkgs-98ff3e401c67a92ef3bb0df7d9e4f0e07dfaffe9.tar nixpkgs-98ff3e401c67a92ef3bb0df7d9e4f0e07dfaffe9.tar.gz nixpkgs-98ff3e401c67a92ef3bb0df7d9e4f0e07dfaffe9.tar.bz2 nixpkgs-98ff3e401c67a92ef3bb0df7d9e4f0e07dfaffe9.tar.lz nixpkgs-98ff3e401c67a92ef3bb0df7d9e4f0e07dfaffe9.tar.xz nixpkgs-98ff3e401c67a92ef3bb0df7d9e4f0e07dfaffe9.tar.zst nixpkgs-98ff3e401c67a92ef3bb0df7d9e4f0e07dfaffe9.zip | |
Merge pull request #165892 from tpwrules/fix-initrd-dirlinks
make-initrd: fix reproducibility problems
Diffstat (limited to 'nixos/modules/system/boot/stage-1.nix')
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 5e42eda3875..d10ebac5682 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -420,7 +420,7 @@ let ${lib.optionalString (config.boot.initrd.secrets == {}) "exit 0"} - export PATH=${pkgs.coreutils}/bin:${pkgs.cpio}/bin:${pkgs.gzip}/bin:${pkgs.findutils}/bin + export PATH=${pkgs.coreutils}/bin:${pkgs.libarchive}/bin:${pkgs.gzip}/bin:${pkgs.findutils}/bin function cleanup { if [ -n "$tmp" -a -d "$tmp" ]; then @@ -440,7 +440,7 @@ let ) config.boot.initrd.secrets) } - (cd "$tmp" && find . -print0 | sort -z | cpio --quiet -o -H newc -R +0:+0 --reproducible --null) | \ + (cd "$tmp" && find . -print0 | sort -z | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @-) | \ ${compressorExe} ${lib.escapeShellArgs initialRamdisk.compressorArgs} >> "$1" ''; |