From 765da508a80937a9dd343bce75e68a30e9f658c3 Mon Sep 17 00:00:00 2001 From: Ambrose Chua Date: Sat, 25 May 2024 04:37:58 +0800 Subject: [PATCH] fix: Script exits fatally when resolv.conf is missing Docker nameserver (#1441) --- pkg/types/fixes/assets/k3d-entrypoint-dns.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/types/fixes/assets/k3d-entrypoint-dns.sh b/pkg/types/fixes/assets/k3d-entrypoint-dns.sh index fb5c7bc2..ce951644 100755 --- a/pkg/types/fixes/assets/k3d-entrypoint-dns.sh +++ b/pkg/types/fixes/assets/k3d-entrypoint-dns.sh @@ -23,9 +23,7 @@ iptables-save \ | iptables-restore # Update resolv.conf to use the Gateway IP if needed: this will also make CoreDNS use it via k3s' default `forward . /etc/resolv.conf` rule in the CoreDNS config -grep -q "${docker_dns}" /etc/resolv.conf -grepstatus=$? -if test $grepstatus -eq 0; then +if grep -q "${docker_dns}" /etc/resolv.conf; then echo "[$(date -Iseconds)] [DNS Fix] > Replacing IP in /etc/resolv.conf ..." cp /etc/resolv.conf /etc/resolv.conf.original sed -e "s/${docker_dns}/${gateway}/g" /etc/resolv.conf.original >/etc/resolv.conf