Skip to content

Commit a89ef8f

Browse files
author
3np
committed
setup-ip: oneshot resolv.conf update
1 parent d7718d2 commit a89ef8f

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

network/setup-ip

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,15 @@ configure_network () {
6666
if [ -h /etc/resolv.conf ]; then
6767
rm -f /etc/resolv.conf
6868
fi
69-
echo -n > /etc/resolv.conf
70-
if ! qsvc disable-dns-server ; then
71-
if [ -n "$primary_dns6" ]; then
72-
echo "nameserver $primary_dns6" >> /etc/resolv.conf
73-
echo "nameserver $secondary_dns6" >> /etc/resolv.conf
74-
fi
75-
echo "nameserver $primary_dns" >> /etc/resolv.conf
76-
echo "nameserver $secondary_dns" >> /etc/resolv.conf
69+
if qsvc disable-dns-server ; then
70+
echo -n > /etc/resolv.conf
71+
else
72+
cat <<EOF > /etc/resolv.conf
73+
nameserver ${primary_dns6}
74+
nameserver ${secondary_dns6}
75+
nameserver ${primary_dns}
76+
nameserver ${secondary_dns}
77+
EOF
7778
fi
7879
fi
7980
if [ -x /usr/bin/resolvectl ] && \

0 commit comments

Comments
 (0)