If we are lacking a domain option, derive one from the hostname if

we can.

diff --git a/dhcpcd-hooks/20-resolv.conf b/dhcpcd-hooks/20-resolv.conf
index 4610079d56e3e4fcfba30453d6075f51fbe5085e..13b8137ee20f3cdada76ec1fe100fc74f1c7927d 100644 (file)
--- a/dhcpcd-hooks/20-resolv.conf
+++ b/dhcpcd-hooks/20-resolv.conf
@@ -89,6 +89,18 @@ add_resolv_conf()
                return $?
        fi
 
+       # Derive a new domain from our various hostname options
+       new_domain_name=
+       if [ -z "$new_domain_name" ]; then
+               if [ "$new_dhcp6_fqdn" != "${new_dhcp6_fqdn#*.}" ]; then
+                       new_domain_name="${new_dhcp6_fqdn#*.}"
+               elif [ "$new_fqdn" != "${new_fqdn#*.}" ]; then
+                       new_domain_name="${new_fqdn#*.}"
+               elif [ "$new_host_name" != "${new_host_name#*.}" ]; then
+                       new_domain_name="${new_host_name#*.}"
+               fi
+       fi
+
        if [ -n "$new_domain_name" ]; then
                set -- $new_domain_name
                new_domain_name="$1"