From bfd86d4e744861011df558254c5354723c9eb51f Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 23 Sep 2013 16:01:56 +0200 Subject: [PATCH] Fix bug in NetworkManager name server configuration --- modules/services/networking/networkmanager.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/services/networking/networkmanager.nix b/modules/services/networking/networkmanager.nix index 7750f3d06f6..1d5682f5f3f 100644 --- a/modules/services/networking/networkmanager.nix +++ b/modules/services/networking/networkmanager.nix @@ -47,7 +47,12 @@ let overrideNameserversScript = writeScript "02overridedns" '' #!/bin/sh ${optionalString cfg.overrideNameservers "${gnused}/bin/sed -i '/nameserver /d' /etc/resolv.conf"} - ${concatStringsSep ";" (map (s: "echo 'nameserver ${s}' >> /etc/resolv.conf") config.networking.nameservers)} + ${concatStrings (map (s: '' + ${optionalString cfg.appendNameservers + "${gnused}/bin/sed -i '/nameserver ${s}/d' /etc/resolv.conf" + } + echo 'nameserver ${s}' >> /etc/resolv.conf + '') config.networking.nameservers)} ''; in {