Change named starting convention to use $namedflags like most other

daemons that take command-line arguments.  Correct /etc/namedb installation
to use the correct files.

3 files changed, 16 insertions, 13 deletions

diff --git a/etc/Makefile b/etc/Makefile
index c6bb7e7..06c8d1e 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-#	$Id: Makefile,v 1.106 1995/03/10 08:42:07 rgrimes Exp $
+#	$Id: Makefile,v 1.107 1995/03/18 07:01:53 rgrimes Exp $
 
 # disktab may be wrong -- hcx9 is a tahoe, but gets its own.
 # -rw-r--r--
@@ -36,7 +36,7 @@ NEWFS=		newfs -b 4096 -c 80 -f 512 -m 0 -o space -u 0 -t 0
 ZIPNSPLIT=	gzip --no-name -9 -c | split -b 240640 -
 
 MTREE=	BSD.local.dist BSD.root.dist BSD.usr.dist BSD.var.dist
-NAMEDB=	localhost.rev named.boot root.cache
+NAMEDB=	PROTO.localhost.rev named.boot root.cache make-localhost
 PPPCNF= ppp.conf.filter.sample ppp.conf.iij ppp.conf.sample \
 	ppp.linkup.sample ppp.secret.sample
 PCS=	pcs750.bin
diff --git a/etc/rc b/etc/rc
index 6caee64..24fcb1b4 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$Id: rc,v 1.47 1995/03/17 17:57:24 rgrimes Exp $
+#	$Id: rc,v 1.48 1995/03/21 15:20:47 jkh Exp $
 #	From: @(#)rc	5.27 (Berkeley) 6/5/91
 
 # System startup script run by init on autoboot
@@ -95,7 +95,7 @@ echo -n ' system logger'
 rm -f /dev/log
 syslogd
 
-# $timedflags is imported from /etc/netstart;
+# $timedflags is imported from /etc/sysconfig;
 # if $timedflags == NO, timed isn't run.
 if [ "X${timedflags}" != X"NO" ]; then
 	echo -n ' time daemon'; timed $timedflags
@@ -164,7 +164,7 @@ if [ -x /usr/sbin/portmap ]; then
 	echo -n ' portmap';		portmap
 fi
 
-# $gated and $routedflags are imported from /etc/netstart.
+# $gated and $routedflags are imported from /etc/sysconfig.
 # If $gated == YES, gated is used; otherwise routed.
 # If $routedflags == NO, routed isn't run.
 if [ "X${gated}" = X"YES" -a -r /etc/gated.conf ]; then
@@ -173,11 +173,12 @@ elif [ "X${routedflags}" != X"NO" ]; then
 	echo -n ' routed';	routed $routedflags
 fi
 
-if [ "X${name_server}" = X"YES" -a -r /etc/namedb/named.boot ]; then
-	echo -n ' named';		named -b /etc/namedb/named.boot
+# $namedflags is imported from /etc/sysconfig
+if [ "X${namedflags}" != "XNO" ]; then
+	echo -n ' named';	named $namedflags
 fi
 
-# $ntpdate and $xntpdflags are imported from /etc/netstart.
+# $ntpdate and $xntpdflags are imported from /etc/sysconfig.
 # If $ntpdate != NO, run ntpdate $ntpdate to set the date correctly.
 # If $xntpdflags != NO, start xntpd.
 if [ "X${ntpdate}" != X"NO" -o "X${xntpdflags}" != X"NO" ]; then
@@ -194,7 +195,7 @@ if [ "X${ntpdate}" != X"NO" -o "X${xntpdflags}" != X"NO" ]; then
 	fi
 fi
 
-# $rwhod is imported from /etc/netstart;
+# $rwhod is imported from /etc/sysconfig;
 # if $rwhod is set to YES, rwhod is run.
 if [ "X${rwhod}" = X"YES" ]; then
 	echo -n ' rwhod';	rwhod
@@ -215,7 +216,7 @@ if [ "X${amdflags}" != X"NO" ]; then
 	echo -n ' amd';			amd ${amdflags}
 fi
 
-# $sendmail_flags is imported from /etc/netstart;
+# $sendmail_flags is imported from /etc/sysconfig;
 # if $sendmail_flags is something other than NO, sendmail is run.
 if [ "X${sendmail_flags}" != X"NO" -a -r /etc/sendmail.cf ]; then
 	echo -n ' sendmail';		sendmail ${sendmail_flags} 
diff --git a/etc/sysconfig b/etc/sysconfig
index b7e4b64..e04a247 100644
--- a/etc/sysconfig
+++ b/etc/sysconfig
@@ -4,7 +4,7 @@
 # This is sysconfig - a file full of useful variables that you can set 
 # to change the default startup behavior of your system.
 #
-#	$Id$
+#	$Id: sysconfig,v 1.1 1995/03/21 15:20:48 jkh Exp $
 
 # Set to screen saver desired:  blank, green, snake, star (or NO for none)
 saver=NO
@@ -55,8 +55,10 @@ nis_serverflags="NO"
 # Typical flags might be "-m /var/yp/master.passwd -s -f"
 yppasswddflags="NO"
 
-# Set to YES if you wish to run a name server
-name_server=NO
+# Set to appropriate flags for named, if you have a full-time
+# connection to the Internet.
+# For most hosts, flags should be "-b /etc/namedb/named.boot"
+namedflags="NO"
 
 # Set to YES if you want to run the X-10 power controller daemon
 xtend=NO