movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-22 17:31:04 +03:00
Code Activity

network-scripting: do not run resolvconf if /etc/resolv.conf is managed manually (#56682)

Browse source 
The second invocation of resolvconf, missed in https://github.com/NixOS/nixpkgs/pull/32308
This commit is contained in:
volth 2019-03-09 11:42:14 +00:00 • committed by Danylo Hlynskyi
parent b8352653ac
commit c730f29e7f
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -103,6 +103,7 @@ let
script = script =
'' ''
${optionalString (!config.environment.etc?"resolv.conf") ''
# Set the static DNS configuration, if given. # Set the static DNS configuration, if given.
${pkgs.openresolv}/sbin/resolvconf -m 1 -a static <<EOF ${pkgs.openresolv}/sbin/resolvconf -m 1 -a static <<EOF
${optionalString (cfg.nameservers != [] && cfg.domain != null) '' ${optionalString (cfg.nameservers != [] && cfg.domain != null) ''
@ -113,6 +114,7 @@ let
nameserver ${ns} nameserver ${ns}
'')} '')}
EOF EOF
''}
# Set the default gateway. # Set the default gateway.
${optionalString (cfg.defaultGateway != null && cfg.defaultGateway.address != "") '' ${optionalString (cfg.defaultGateway != null && cfg.defaultGateway.address != "") ''