summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2002-07-18 05:00:20 +0000
committerdougb <dougb@FreeBSD.org>2002-07-18 05:00:20 +0000
commit0564223a48fc506f96a18f3082e1e43f34c51006 (patch)
tree4198fc415725a372174956906a8ab48f82ab0eb5 /etc
parent30dfb601b9fa1c1efa9d22093136e0c2432e87cb (diff)
downloadFreeBSD-src-0564223a48fc506f96a18f3082e1e43f34c51006.zip
FreeBSD-src-0564223a48fc506f96a18f3082e1e43f34c51006.tar.gz
Make nisdomainname=NO DTRT
Submitted by: des, via Mike Makonnen <makonnen@pacbell.net>
Diffstat (limited to 'etc')
-rw-r--r--etc/network.subr8
-rw-r--r--etc/rc.d/network18
2 files changed, 12 insertions, 4 deletions
diff --git a/etc/network.subr b/etc/network.subr
index 7981858..4e08b9f 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -113,10 +113,14 @@ network_start()
# Set the domainname if we're using NIS
#
- if checkyesno nisdomainname ; then
+ case ${nisdomainname} in
+ [Nn][Oo]|'')
+ ;;
+ *)
domainname ${nisdomainname}
echo -n ' domain'
- fi
+ ;;
+ esac
echo '.'
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index 7981858..4e08b9f 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -113,10 +113,14 @@ network_start()
# Set the domainname if we're using NIS
#
- if checkyesno nisdomainname ; then
+ case ${nisdomainname} in
+ [Nn][Oo]|'')
+ ;;
+ *)
domainname ${nisdomainname}
echo -n ' domain'
- fi
+ ;;
+ esac
echo '.'
OpenPOWER on IntegriCloud