Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b8352653ac97
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c730f29e7f14
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 9, 2019

  1. network-scripting: do not run resolvconf if /etc/resolv.conf is manag… 

    …ed manually (#56682)

The second invocation of resolvconf, missed in #32308
    @danbst
    volth authored and danbst committed Mar 9, 2019
    Copy the full SHA
    c730f29 View commit details
Showing with 11 additions and 9 deletions.
  1. +11 −9 nixos/modules/tasks/network-interfaces-scripted.nix
20 changes: 11 additions & 9 deletions nixos/modules/tasks/network-interfaces-scripted.nix
View file
Original file line number Diff line number Diff line change
@@ -103,16 +103,18 @@ let

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