Commit 076f59fd authored by clerie's avatar clerie
Browse files

nixos/networking: network.target depends on netdev service directly 

So we don't depend on addresses configured for an interface or
network-setup.service existing anymore.

Fixes #349882
parent a03ec2af

nixos/modules/tasks/network-interfaces-scripted.nix

+10 −0
Original line number Diff line number Diff line
@@ -311,6 +311,7 @@ let 
            bindsTo = optional (!config.boot.isContainer) "dev-net-tun.device";

            after = optional (!config.boot.isContainer) "dev-net-tun.device" ++ [ "network-pre.target" ];

            wantedBy = [

              "network.target"

              "network-setup.service"

              (subsystemDevice i.name)

            ];
@@ -337,6 +338,7 @@ let 
            {

              description = "Bridge Interface ${n}";

              wantedBy = [

                "network.target"

                "network-setup.service"

                (subsystemDevice n)

              ];
@@ -441,6 +443,7 @@ let 
            {

              description = "Open vSwitch Interface ${n}";

              wantedBy = [

                "network.target"

                "network-setup.service"

                (subsystemDevice n)

              ]
@@ -513,6 +516,7 @@ let 
            {

              description = "Bond Interface ${n}";

              wantedBy = [

                "network.target"

                "network-setup.service"

                (subsystemDevice n)

              ];
@@ -561,6 +565,7 @@ let 
            {

              description = "MACVLAN Interface ${n}";

              wantedBy = [

                "network.target"

                "network-setup.service"

                (subsystemDevice n)

              ];
@@ -604,6 +609,7 @@ let 
            {

              description = "FOU endpoint ${n}";

              wantedBy = [

                "network.target"

                "network-setup.service"

                (subsystemDevice n)

              ];
@@ -633,6 +639,7 @@ let 
            {

              description = "IPv6 in IPv4 Tunnel Interface ${n}";

              wantedBy = [

                "network.target"

                "network-setup.service"

                (subsystemDevice n)

              ];
@@ -675,6 +682,7 @@ let 
            {

              description = "IP in IP Tunnel Interface ${n}";

              wantedBy = [

                "network.target"

                "network-setup.service"

                (subsystemDevice n)

              ];
@@ -722,6 +730,7 @@ let 
            {

              description = "GRE Tunnel Interface ${n}";

              wantedBy = [

                "network.target"

                "network-setup.service"

                (subsystemDevice n)

              ];
@@ -756,6 +765,7 @@ let 
            {

              description = "VLAN Interface ${n}";

              wantedBy = [

                "network.target"

                "network-setup.service"

                (subsystemDevice n)

              ];