File tree 1 file changed +15
-2
lines changed
1 file changed +15
-2
lines changed Original file line number Diff line number Diff line change @@ -2600,7 +2600,20 @@ generate_resolvconf() {
2600
2600
# execute_chroot_command "netconfig update -f"
2601
2601
fi
2602
2602
# 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
2604
2617
echo " ### $COMPANY installimage" > " $NAMESERVERFILE "
2605
2618
echo " # nameserver config" >> " $NAMESERVERFILE "
2606
2619
@@ -2619,7 +2632,7 @@ generate_resolvconf() {
2619
2632
echo " nameserver ${DNSRESOLVER_V6[$index]} " >> " $NAMESERVERFILE "
2620
2633
done
2621
2634
fi
2622
- # fi
2635
+ fi
2623
2636
2624
2637
return 0
2625
2638
}
You can’t perform that action at this time.
0 commit comments