diff options
| author | Janne Heß <janne@hess.ooo> | 2021-12-08 15:38:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-08 15:38:02 +0100 |
| commit | e36ceb65e6914265f1b0ad8d8d04aa5786c546e2 (patch) | |
| tree | 6cc2cfd1e36059a4f5fb371e82f55107b9294e3a /nixos/modules/system/boot/stage-1.nix | |
| parent | 0b75a168930d64bd1531469cf52f2eb6aa7d917b (diff) | |
| parent | 30b97d7ccaf25324926301524d040c4524470046 (diff) | |
| download | nixpkgs-e36ceb65e6914265f1b0ad8d8d04aa5786c546e2.tar nixpkgs-e36ceb65e6914265f1b0ad8d8d04aa5786c546e2.tar.gz nixpkgs-e36ceb65e6914265f1b0ad8d8d04aa5786c546e2.tar.bz2 nixpkgs-e36ceb65e6914265f1b0ad8d8d04aa5786c546e2.tar.lz nixpkgs-e36ceb65e6914265f1b0ad8d8d04aa5786c546e2.tar.xz nixpkgs-e36ceb65e6914265f1b0ad8d8d04aa5786c546e2.tar.zst nixpkgs-e36ceb65e6914265f1b0ad8d8d04aa5786c546e2.zip | |
Merge pull request #129449 from ddz/copy-initrd-secrets-after-early-mount-script
nixos/stage1: copy initrd secrets into place after special mounts
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 adbed9d8d58..409424a5b0f 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -411,8 +411,8 @@ let ${lib.concatStringsSep "\n" (mapAttrsToList (dest: source: let source' = if source == null then dest else toString source; in '' - mkdir -p $(dirname "$tmp/${dest}") - cp -a ${source'} "$tmp/${dest}" + mkdir -p $(dirname "$tmp/.initrd-secrets/${dest}") + cp -a ${source'} "$tmp/.initrd-secrets/${dest}" '' ) config.boot.initrd.secrets) } |