Unverified Commit 17952ee5 authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

Merge pull request #35141 from abbradar/dhcpcd-order 

dhcpcd service: fix service dependencies when default gateways are set
parents 34e9d390 d77984f5

nixos/modules/services/networking/dhcpcd.nix

+2 −2
Original line number Diff line number Diff line
@@ -156,11 +156,11 @@ in 
    systemd.services.dhcpcd = let

      cfgN = config.networking;

      hasDefaultGatewaySet = (cfgN.defaultGateway != null && cfgN.defaultGateway.address != "")

                          || (cfgN.defaultGateway6 != null && cfgN.defaultGateway6.address != "");

                          && (!cfgN.enableIPv6 || (cfgN.defaultGateway6 != null && cfgN.defaultGateway6.address != ""));

    in

      { description = "DHCP Client";



        wantedBy = optional (!hasDefaultGatewaySet) "network-online.target";

        wantedBy = [ "multi-user.target" ] ++ optional (!hasDefaultGatewaySet) "network-online.target";

        after = [ "network.target" ];

        wants = [ "network.target" ];

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

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ let 
          else optional (dev != null && dev != "lo" && !config.boot.isContainer) (subsystemDevice dev);



        hasDefaultGatewaySet = (cfg.defaultGateway != null && cfg.defaultGateway.address != "")

                            || (cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "");

                            || (cfg.enableIPv6 && cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "");



        networkLocalCommands = {

          after = [ "network-setup.service" ];