Skip to content

Commit e2c26a0

Browse files
committed
add support for systemd resolved configuration on ubuntu 18.04
1 parent 736f6fd commit e2c26a0

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

functions.sh

+15-1
Original file line numberDiff line numberDiff line change
@@ -2606,7 +2606,21 @@ generate_resolvconf() {
26062606
# execute_chroot_command "netconfig update -f"
26072607
fi
26082608
# else
2609-
NAMESERVERFILE="$FOLD/hdd/etc/resolv.conf"
2609+
NAMESERVERFILE="$FOLD/hdd/etc/resolv.conf"
2610+
SYSTEMD_RESOLV_CONF="$FOLD/hdd/etc/systemd/resolved.conf"
2611+
if [ "$IAM" = "ubuntu" ] && [ "$IMG_VERSION" -ge 1604 ] && \
2612+
[ -L "$NAMESERVERFILE" ] && [ -e "$SYSTEMD_RESOLV_CONF" ]; then
2613+
if [ "$V6ONLY" -eq 1 ]; then
2614+
debug "# skipping IPv4 DNS resolvers"
2615+
sed -i "s/^#DNS=/DNS=${DNSRESOLVER_V6[*]}/g" "$SYSTEMD_RESOLV_CONF"
2616+
elif [ -n "$DOIPV6" ]; then
2617+
echo "$NAMESERVER" "$DNSRESOLVER_V6"
2618+
sed -i "s/^#DNS=/DNS=${NAMESERVER[*]}\ ${DNSRESOLVER_V6[*]}/g" "$SYSTEMD_RESOLV_CONF"
2619+
else
2620+
sed -i "s/^#DNS=/DNS=${NAMESERVER[*]}/g" "$SYSTEMD_RESOLV_CONF"
2621+
fi
2622+
2623+
else
26102624
echo "### $COMPANY installimage" > "$NAMESERVERFILE"
26112625
echo "# nameserver config" >> "$NAMESERVERFILE"
26122626

0 commit comments

Comments
 (0)