gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

network: make network setup service do not depend on udev, and fix typo with greTunnels (#373931)

Browse Source
This commit is contained in:
Michele Guerini Rocco
2025-02-25 08:06:51 +01:00
committed by GitHub
parent d249c1cf5a 201f27715e
commit 64ddb39f99
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/tasks/network-interfaces-scripted.nix
View File

@@ -77,6 +77,7 @@ let
(hasAttr dev cfg.macvlans) || (hasAttr dev cfg.macvlans) ||
(hasAttr dev cfg.sits) || (hasAttr dev cfg.sits) ||
(hasAttr dev cfg.vlans) || (hasAttr dev cfg.vlans) ||
(hasAttr dev cfg.greTunnels) ||
(hasAttr dev cfg.vswitches) (hasAttr dev cfg.vswitches)
then [ "${dev}-netdev.service" ] then [ "${dev}-netdev.service" ]
else optional (!config.boot.isContainer) (subsystemDevice dev); else optional (!config.boot.isContainer) (subsystemDevice dev);
@@ -94,7 +95,7 @@ let
networkSetup = lib.mkIf needNetworkSetup networkSetup = lib.mkIf needNetworkSetup
{ description = "Networking Setup"; { description = "Networking Setup";
after = [ "network-pre.target" "systemd-udevd.service" "systemd-sysctl.service" ]; after = [ "network-pre.target" ];
before = [ "network.target" "shutdown.target" ]; before = [ "network.target" "shutdown.target" ];
wants = [ "network.target" ]; wants = [ "network.target" ];
# exclude bridges from the partOf relationship to fix container networking bug #47210 # exclude bridges from the partOf relationship to fix container networking bug #47210