File tree 1 file changed +15
-1
lines changed
1 file changed +15
-1
lines changed Original file line number Diff line number Diff line change @@ -2606,7 +2606,21 @@ generate_resolvconf() {
2606
2606
# execute_chroot_command "netconfig update -f"
2607
2607
fi
2608
2608
# 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
2610
2624
echo " ### $COMPANY installimage" > " $NAMESERVERFILE "
2611
2625
echo " # nameserver config" >> " $NAMESERVERFILE "
2612
2626
You can’t perform that action at this time.
0 commit comments