dns2!

Author: CMGS

os-image/ubuntu/network.sh

@@ -17,6 +17,8 @@ case "$1" in prereqs) prereqs; exit 0 ;; esac
 # $rootmnt is set by initramfs — points to the mounted root filesystem.
 [ -z "$rootmnt" ] && exit 0
 
+_dns_servers=""
+
 for conf_file in /run/net-*.conf; do
     [ -f "$conf_file" ] || continue
 
@@ -52,14 +54,20 @@ EOF
         [ -z "$IPV4DNS0" ] || [ "$IPV4DNS0" = "0.0.0.0" ] && printf "DNS=8.8.8.8\nDNS=8.8.4.4\n"
     } > "${rootmnt}/etc/systemd/network/10-${DEVICE}.network"
 
+    # Collect DNS servers for resolv.conf.
+    [ -n "$IPV4DNS0" ] && [ "$IPV4DNS0" != "0.0.0.0" ] && _dns_servers="${_dns_servers} ${IPV4DNS0}"
+    [ -n "$IPV4DNS1" ] && [ "$IPV4DNS1" != "0.0.0.0" ] && _dns_servers="${_dns_servers} ${IPV4DNS1}"
+
     # Set hostname from the first interface that has one.
     if [ -n "$HOSTNAME" ] && [ ! -f "${rootmnt}/etc/cocoon-hostname-set" ]; then
         echo "$HOSTNAME" > "${rootmnt}/etc/hostname"
         : > "${rootmnt}/etc/cocoon-hostname-set"
     fi
 done
 
-# Point resolv.conf at /proc/net/pnp — the kernel writes DNS servers
-# from the ip= cmdline parameter there in resolv.conf format.
-# No ip= means /proc/net/pnp won't exist, which is fine (same as empty).
-ln -sf /proc/net/pnp "${rootmnt}/etc/resolv.conf"
+# Write /etc/resolv.conf from DNS servers collected above.
+[ -z "$_dns_servers" ] && _dns_servers="8.8.8.8 8.8.4.4"
+: > "${rootmnt}/etc/resolv.conf"
+for _ns in $_dns_servers; do
+    printf "nameserver %s\n" "$_ns" >> "${rootmnt}/etc/resolv.conf"
+done