diff options
| author | phk <phk@FreeBSD.org> | 2003-10-03 18:26:33 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2003-10-03 18:26:33 +0000 |
| commit | 2eee80dc38ec87a007e98d817061d601e30f89bc (patch) | |
| tree | 66f0e6ef2a9dc146b84b486e9452558ae1396049 /etc | |
| parent | 8dd5eb97cf24bf6f275042acc34c5574ca559739 (diff) | |
| download | FreeBSD-src-2eee80dc38ec87a007e98d817061d601e30f89bc.zip FreeBSD-src-2eee80dc38ec87a007e98d817061d601e30f89bc.tar.gz | |
In case we have no /etc/resolv.conf, don't try to make it out of
thin blue air if the kenv doesn't have any info.
This improves the truth value of the comment above significantly and
reduces the bogous output on the console considerably.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/rc.d/diskless | 2 | ||||
| -rw-r--r-- | etc/rc.d/resolv | 2 | ||||
| -rw-r--r-- | etc/rc.d/tmp | 2 | ||||
| -rw-r--r-- | etc/rc.d/var | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/etc/rc.d/diskless b/etc/rc.d/diskless index 748a10b..a244d71 100644 --- a/etc/rc.d/diskless +++ b/etc/rc.d/diskless @@ -154,7 +154,7 @@ fi # if the info is available via dhcp/kenv # build the resolv.conf # -if [ ! -e /etc/resolv.conf ]; then +if [ ! -e /etc/resolv.conf -a `/bin/kenv dhcp.domain-name-servers` != "" ]; then echo domain `/bin/kenv dhcp.domain-name` > /etc/resolv.conf set `/bin/kenv dhcp.domain-name-servers` diff --git a/etc/rc.d/resolv b/etc/rc.d/resolv index 748a10b..a244d71 100644 --- a/etc/rc.d/resolv +++ b/etc/rc.d/resolv @@ -154,7 +154,7 @@ fi # if the info is available via dhcp/kenv # build the resolv.conf # -if [ ! -e /etc/resolv.conf ]; then +if [ ! -e /etc/resolv.conf -a `/bin/kenv dhcp.domain-name-servers` != "" ]; then echo domain `/bin/kenv dhcp.domain-name` > /etc/resolv.conf set `/bin/kenv dhcp.domain-name-servers` diff --git a/etc/rc.d/tmp b/etc/rc.d/tmp index 748a10b..a244d71 100644 --- a/etc/rc.d/tmp +++ b/etc/rc.d/tmp @@ -154,7 +154,7 @@ fi # if the info is available via dhcp/kenv # build the resolv.conf # -if [ ! -e /etc/resolv.conf ]; then +if [ ! -e /etc/resolv.conf -a `/bin/kenv dhcp.domain-name-servers` != "" ]; then echo domain `/bin/kenv dhcp.domain-name` > /etc/resolv.conf set `/bin/kenv dhcp.domain-name-servers` diff --git a/etc/rc.d/var b/etc/rc.d/var index 748a10b..a244d71 100644 --- a/etc/rc.d/var +++ b/etc/rc.d/var @@ -154,7 +154,7 @@ fi # if the info is available via dhcp/kenv # build the resolv.conf # -if [ ! -e /etc/resolv.conf ]; then +if [ ! -e /etc/resolv.conf -a `/bin/kenv dhcp.domain-name-servers` != "" ]; then echo domain `/bin/kenv dhcp.domain-name` > /etc/resolv.conf set `/bin/kenv dhcp.domain-name-servers` |
