diff options
| author | dougb <dougb@FreeBSD.org> | 2007-06-02 05:24:39 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2007-06-02 05:24:39 +0000 |
| commit | 9f19c3eceef70cf3d57318bae052988eaf77e43f (patch) | |
| tree | fdc98e7683168bb716d311b5917bde08c753baf6 | |
| parent | 206255ce0b15f685f3c74bfdd9b572110a28a889 (diff) | |
| download | FreeBSD-src-9f19c3eceef70cf3d57318bae052988eaf77e43f.zip FreeBSD-src-9f19c3eceef70cf3d57318bae052988eaf77e43f.tar.gz | |
Add REQUIRE netif to make ordering more deterministic, and to make sure
we have a fighting chance of having useful stuff from DHCP.
Tighten up the code a little, and fix whitespace issues.
| -rw-r--r-- | etc/rc.d/resolv | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/etc/rc.d/resolv b/etc/rc.d/resolv index 08e775f..3acf320 100644 --- a/etc/rc.d/resolv +++ b/etc/rc.d/resolv @@ -28,6 +28,7 @@ # # PROVIDE: resolv +# REQUIRE: netif # KEYWORD: nojail . /etc/rc.subr @@ -41,15 +42,15 @@ load_rc_config $name # if [ ! -e /etc/resolv.conf -a \ -n "`/bin/kenv dhcp.domain-name-servers 2> /dev/null`" ]; then - /bin/cat /dev/null > /etc/resolv.conf + > /etc/resolv.conf if [ -n "`/bin/kenv dhcp.domain-name 2> /dev/null`" ]; then echo domain `/bin/kenv dhcp.domain-name` > /etc/resolv.conf fi - set -- `/bin/kenv dhcp.domain-name-servers` - for ns in `IFS=','; echo $*`; do - echo nameserver $ns >> /etc/resolv.conf; - done + set -- `/bin/kenv dhcp.domain-name-servers` + for ns in `IFS=','; echo $*`; do + echo nameserver $ns >> /etc/resolv.conf; + done fi |
