movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse source
This commit is contained in:
K900 2025-01-09 22:02:14 +03:00
commit 350a060f1d
103 changed files with 2145 additions and 8971 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/system/boot/luksroot.nix
View file

@ -1115,8 +1115,8 @@ in
"initrd-switch-root.target"
"shutdown.target"
];
wants = [ "systemd-udev-settle.service" ] ++ optional clevis.useTang "network-online.target";
after = [ "systemd-modules-load.service" "systemd-udev-settle.service" ] ++ optional clevis.useTang "network-online.target";
wants = optional clevis.useTang "network-online.target";
after = [ "systemd-modules-load.service" "tpm2.target" ] ++ optional clevis.useTang "network-online.target";
script = ''
mkdir -p /clevis-${name}
mount -t ramfs none /clevis-${name}