diff options
| author | rgrimes <rgrimes@FreeBSD.org> | 1995-04-24 23:52:16 +0000 |
|---|---|---|
| committer | rgrimes <rgrimes@FreeBSD.org> | 1995-04-24 23:52:16 +0000 |
| commit | 7297445841f40eb06c4fc004d2d25408e8740c68 (patch) | |
| tree | 4283e3b7b786921b2ec6d43479dfdb5277d0cf1d /etc/netstart | |
| parent | 224e2db404ba5258aa3feb43c9638f83a2d18a3e (diff) | |
| download | FreeBSD-src-7297445841f40eb06c4fc004d2d25408e8740c68.zip FreeBSD-src-7297445841f40eb06c4fc004d2d25408e8740c68.tar.gz | |
Add $defaultdomainname to sysconfig and use it in netstart to set the
domainname. This eliminates /etc/defaultdomain.
Correct tickadj, it should have been tickadjflags.
Diffstat (limited to 'etc/netstart')
| -rwxr-xr-x | etc/netstart | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/etc/netstart b/etc/netstart index 18dc70d..7bbb70a 100755 --- a/etc/netstart +++ b/etc/netstart @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: netstart,v 1.27 1995/04/11 01:22:15 rgrimes Exp $ +# $Id: netstart,v 1.28 1995/04/12 16:58:06 ache Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # If there is a global system configuration file, suck it in. @@ -14,9 +14,8 @@ if [ -z "`hostname -s`" ] ; then fi # Set the domainname if we're using NIS -if [ -z "`domainname`" -a -e "/etc/defaultdomain" ] ; then - domainname=`cat /etc/defaultdomain` - domainname $domainname +if [ -n "$defaultdomainname" -a "x$defaultdomainname" != "xNO" ] ; then + domainname $defaultdomainname fi # Set up all the network interfaces, calling startup scripts if needed |
