Skip to content

Commit 14a5505

Browse files
committed
add support for systemd resolved configuration on ubuntu 18.04
1 parent 66358d4 commit 14a5505

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

functions.sh

+15-2
Original file line numberDiff line numberDiff line change
@@ -2600,7 +2600,20 @@ generate_resolvconf() {
26002600
# execute_chroot_command "netconfig update -f"
26012601
fi
26022602
# else
2603-
NAMESERVERFILE="$FOLD/hdd/etc/resolv.conf"
2603+
NAMESERVERFILE="$FOLD/hdd/etc/resolv.conf"
2604+
SYSTEMD_RESOLV_CONF="$FOLD/hdd/etc/systemd/resolved.conf"
2605+
if [ "$IAM" = "ubuntu" ] && [ "$IMG_VERSION" -ge 1604 ] && \
2606+
[ -L "$NAMESERVERFILE" ] && [ -e "$SYSTEMD_RESOLV_CONF" ]; then
2607+
if [ "$V6ONLY" -eq 1 ]; then
2608+
debug "# skipping IPv4 DNS resolvers"
2609+
sed -i "s/^#DNS=/DNS=${DNSRESOLVER_V6[*]}/g" "$SYSTEMD_RESOLV_CONF"
2610+
elif [ -n "$DOIPV6" ]; then
2611+
sed -i "s/^#DNS=/DNS=${NAMESERVER[*]}\ ${DNSRESOLVER_V6[*]}/g" "$SYSTEMD_RESOLV_CONF"
2612+
else
2613+
sed -i "s/^#DNS=/DNS=${NAMESERVER[*]}/g" "$SYSTEMD_RESOLV_CONF"
2614+
fi
2615+
2616+
else
26042617
echo "### $COMPANY installimage" > "$NAMESERVERFILE"
26052618
echo "# nameserver config" >> "$NAMESERVERFILE"
26062619

@@ -2619,7 +2632,7 @@ generate_resolvconf() {
26192632
echo "nameserver ${DNSRESOLVER_V6[$index]}" >> "$NAMESERVERFILE"
26202633
done
26212634
fi
2622-
# fi
2635+
fi
26232636

26242637
return 0
26252638
}

0 commit comments

Comments
 (0)