diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-02 06:01:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-02 06:01:42 +0000 |
| commit | 3a8e4cc2aacae6a02766368b22981e55aa04cf33 (patch) | |
| tree | 77de065b01601782ffff229c9acbaecff31bbb2d /nixos | |
| parent | 55c7945b8e40db48dfd5e6b889d39ea85f96b920 (diff) | |
| parent | 20f8a0a4e7c769d4ca5e2e35b4851c6e72674ea1 (diff) | |
| download | nixlib-3a8e4cc2aacae6a02766368b22981e55aa04cf33.tar nixlib-3a8e4cc2aacae6a02766368b22981e55aa04cf33.tar.gz nixlib-3a8e4cc2aacae6a02766368b22981e55aa04cf33.tar.bz2 nixlib-3a8e4cc2aacae6a02766368b22981e55aa04cf33.tar.lz nixlib-3a8e4cc2aacae6a02766368b22981e55aa04cf33.tar.xz nixlib-3a8e4cc2aacae6a02766368b22981e55aa04cf33.tar.zst nixlib-3a8e4cc2aacae6a02766368b22981e55aa04cf33.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/networkd.nix | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index f236a4c005ad..a7399bd55e77 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -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" ]; |