Unverified Commit 35618d0b authored by Michele Guerini Rocco's avatar Michele Guerini Rocco Committed by GitHub
Browse files

nixos/dhcpcd: fix race between namespace setup and resolvconf (#348305)

parents 545276d8 52e2e702

nixos/modules/config/resolvconf.nix

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ in 
        wants = [ "network-pre.target" ];

        wantedBy = [ "multi-user.target" ];

        restartTriggers = [ config.environment.etc."resolvconf.conf".source ];

        serviceConfig.Type = "oneshot";

        serviceConfig.RemainAfterExit = true;



        script = ''

nixos/modules/services/networking/dhcpcd.nix

+2 −1
Original line number Diff line number Diff line
@@ -210,7 +210,8 @@ in 
      { description = "DHCP Client";



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

        wants = [ "network.target" ];

        wants = [ "network.target"  "resolvconf.service" ];

        after = [ "resolvconf.service" ];

        before = [ "network-online.target" ];



        restartTriggers = [ cfg.runHook ];