From 91c1935fe571476b48b5796f59254bf779105504 Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Fri, 3 Oct 2003 18:26:33 +0000
Subject: [PATCH] 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.
---
 etc/rc.d/diskless | 2 +-
 etc/rc.d/resolv   | 2 +-
 etc/rc.d/tmp      | 2 +-
 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 748a10bc7888..a244d71f5c48 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 748a10bc7888..a244d71f5c48 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 748a10bc7888..a244d71f5c48 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 748a10bc7888..a244d71f5c48 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`