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

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2024-02-02 06:01:42 +00:00 • committed by GitHub
commit 3a8e4cc2aa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
30 changed files with 620 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/system/boot/networkd.nix
View file

@ -2989,15 +2989,9 @@ let
systemd.services.systemd-networkd = {
wantedBy = [ "initrd.target" ];
# These before and conflicts lines can be removed when this PR makes it into a release:
# https://github.com/systemd/systemd/pull/27791
before = ["initrd-switch-root.target"];
conflicts = ["initrd-switch-root.target"];
};
systemd.sockets.systemd-networkd = {
wantedBy = [ "initrd.target" ];
before = ["initrd-switch-root.target"];
conflicts = ["initrd-switch-root.target"];
};
systemd.services.systemd-network-generator.wantedBy = [ "sysinit.target" ];