From 1f4ca1ba1a0b2a012789a1f2ca4921a9c322a237 Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Tue, 24 Nov 2020 14:54:15 -0800 Subject: [PATCH] nameserver parsing fix --- nixos-infect | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/nixos-infect b/nixos-infect index 714bbe7..9947603 100755 --- a/nixos-infect +++ b/nixos-infect @@ -84,10 +84,7 @@ EOF extraRules1="" fi - nameservers=() - while IFS='' read -r line; do - nameservers+=("$line") - done < <(grep ^nameserver /etc/resolv.conf | cut -f2 -d' ') + readarray nameservers < <(grep ^nameserver /etc/resolv.conf | sed -r 's/^nameserver[[:space:]]+([0-9.a-fA-F]+).*/"\1"/') if [[ "$eth0_name" = eth* ]]; then predictable_inames="usePredictableInterfaceNames = lib.mkForce false;" @@ -99,9 +96,7 @@ EOF # This file was populated at runtime with the networking # details gathered from the active system. networking = { - nameservers = [$(for a in "${nameservers[@]}"; do echo -n " - $a"; done) - ]; + nameservers = [ ${nameservers[@]} ]; defaultGateway = "${gateway}"; defaultGateway6 = "${gateway6}"; dhcpcd.enable = false;