diff options
author | Bjørn Mork <bjorn@mork.no> | 2011-10-20 18:43:35 +0200 |
---|---|---|
committer | Bjørn Mork <bjorn@mork.no> | 2011-10-20 18:43:35 +0200 |
commit | f53ffd2bf326a3f38681af654d4e804238614ca7 (patch) | |
tree | f48f3266e96215d1028f35151499a53703e1d8d0 /client/scripts/macos | |
parent | 3f2aa5b0dfa2e72930bf8d62da445e36d3cfcd3a (diff) | |
parent | 87d654840a8e3708d6540037fe95359c073ed021 (diff) |
Merge branch 'upstream'
Diffstat (limited to 'client/scripts/macos')
-rwxr-xr-x | client/scripts/macos | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/client/scripts/macos b/client/scripts/macos index cb467d1..bb94c81 100755 --- a/client/scripts/macos +++ b/client/scripts/macos @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: macos,v 1.2.108.1 2011-05-18 20:01:54 sar Exp $ +# $Id: macos,v 1.2.108.2 2011-09-20 17:04:03 sar Exp $ # # automous run of this script will commit the DNS setting # @@ -49,8 +49,13 @@ make_resolv_conf() { } # Try to commit /var/run/resolv.conf.dhclient6 contents to -# SystemConfiguration Dynamic Store +# System Configuration framework's Dynamic Store. # Note this will be cleared by the next location change +# or preempted by IPv4. +# +# The System Configuration agent "IPMonitor" gets the DNS configuration +# from the IPv4 or IPv6 primary service in the Dynamic Store +# (managed by configd). commit_resolv_conf() { if [ -f /var/run/resolv.conf.dhclient6 ]; then if [ -x /usr/sbin/scutil ]; then |