mynix/nixos-infect
1
0
Fork 0
mirror of https://github.com/elitak/nixos-infect.git synced 2024-12-22 16:18:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

nameserver parsing fix

Browse source
This commit is contained in:
Eric Litak 2020-11-24 14:54:15 -08:00
parent 10e8dfe80a
commit 1f4ca1ba1a
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nixos-infect
View file

@ -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;