movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 20:55:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/network-interfaces-scripted: don't bindTo absent network-setup.service

Browse source
This commit is contained in:
Michael Livshin 2022-06-24 20:43:40 +03:00
parent 07328220b6
commit cd13a2074b
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/tasks/network-interfaces-scripted.nix
View file

@ -85,12 +85,14 @@ let
hasDefaultGatewaySet = (cfg.defaultGateway != null && cfg.defaultGateway.address != "") hasDefaultGatewaySet = (cfg.defaultGateway != null && cfg.defaultGateway.address != "")
|| (cfg.enableIPv6 && cfg.defaultGateway6 != null && cfg.defaultGateway6.address != ""); || (cfg.enableIPv6 && cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "");
networkLocalCommands = { needNetworkSetup = cfg.resolvconf.enable || cfg.defaultGateway != null || cfg.defaultGateway6 != null;
networkLocalCommands = lib.mkIf needNetworkSetup {
after = [ "network-setup.service" ]; after = [ "network-setup.service" ];
bindsTo = [ "network-setup.service" ]; bindsTo = [ "network-setup.service" ];
}; };
networkSetup = lib.mkIf (config.networking.resolvconf.enable || cfg.defaultGateway != null || cfg.defaultGateway6 != null) networkSetup = lib.mkIf needNetworkSetup
{ description = "Networking Setup"; { description = "Networking Setup";
after = [ "network-pre.target" "systemd-udevd.service" "systemd-sysctl.service" ]; after = [ "network-pre.target" "systemd-udevd.service" "systemd-sysctl.service" ];