diff options
| author | Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org> | 2011-08-04 17:26:54 -0700 |
|---|---|---|
| committer | Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org> | 2011-08-04 17:26:54 -0700 |
| commit | 276043a4e62a0ac7b426b4582f040075d6cb6509 (patch) | |
| tree | 07fc07a4b0386c553f0689f91d7452cdd2114eaf /usr/src/cmd/svc | |
| parent | 5ab8bad6fb77ff2875cb7f92a79a12db0453961d (diff) | |
| download | illumos-joyent-276043a4e62a0ac7b426b4582f040075d6cb6509.tar.gz | |
1176 NWAM handling of multiple DHCP-assigned DNS domains broken
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
Reviewed by: Albert Lee <trisk@nexenta.com>
Approved by: Garrett D'Amore <garrett@nexenta.com>
Diffstat (limited to 'usr/src/cmd/svc')
| -rw-r--r-- | usr/src/cmd/svc/milestone/net-loc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr/src/cmd/svc/milestone/net-loc b/usr/src/cmd/svc/milestone/net-loc index f5419c297c..e4d0a8c994 100644 --- a/usr/src/cmd/svc/milestone/net-loc +++ b/usr/src/cmd/svc/milestone/net-loc @@ -202,9 +202,11 @@ do_dns () { dns-nameservice-search` ;; 'dhcp') - DNS_DOMAIN=`get_dhcpinfo DNSdmain` + DNS_SEARCH=`get_dhcpinfo DNSdmain` DNS_SERVERS=`get_dhcpinfo DNSserv` - # No DNS search info for IPv4 + # Use first search list entry as default domain + set -- $DNS_SEARCH + DNS_DOMAIN=$1 ;; '*') echo "Unrecognized DNS configsrc ${configsrc}; ignoring" |