Add an additional `named_program' variable so that we can easily choose

between 4.9.6 and the port of 8.x.

8 files changed, 16 insertions, 15 deletions

diff --git a/etc/network.subr b/etc/network.subr
index eac6f3f..f26fbd4 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.13 1997/12/01 06:11:34 obrien Exp $
+#	$Id: rc.network,v 1.14 1998/01/10 03:33:39 alex Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -138,7 +138,7 @@ network_pass1() {
 network_pass2() {
     echo -n 'Doing additional network setup:'
     if [ "X${named_enable}" = X"YES" ]; then
-	    echo -n ' named';		named ${named_flags}
+	    echo -n ' named';		${named_program-"named"} ${named_flags}
     fi
 
     if [ "X${ntpdate_enable}" = X"YES" ]; then
diff --git a/etc/rc.conf b/etc/rc.conf
index 088f303..57561be 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -6,7 +6,7 @@
 #
 # All arguments must be in double or single quotes.
 #
-#	$Id: rc.conf,v 1.35 1997/12/14 12:30:59 jkh Exp $
+#	$Id: rc.conf,v 1.36 1997/12/27 19:46:54 steve Exp $
 
 ##############################################################
 ### Important initial Boot-time options  #####################
@@ -42,6 +42,7 @@ syslogd_flags=""		# Flags to syslogd (if enabled).
 inetd_enable="YES"		# Run the network daemon dispatcher (or NO).
 inetd_flags=""			# Optional flags to inetd.
 named_enable="NO"		# Run named, the DNS server (or NO).
+named_program="/usr/sbin/named"	# named program, in case we want bind8 instead.
 named_flags="-b /etc/namedb/named.boot" # Flags to named (if enabled).
 kerberos_server_enable="NO"	# Run a kerberos master server (or NO).
 kadmind_server_enable="NO"	# Run kadmind (or NO) -- do not run on
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index eac6f3f..f26fbd4 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.13 1997/12/01 06:11:34 obrien Exp $
+#	$Id: rc.network,v 1.14 1998/01/10 03:33:39 alex Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -138,7 +138,7 @@ network_pass1() {
 network_pass2() {
     echo -n 'Doing additional network setup:'
     if [ "X${named_enable}" = X"YES" ]; then
-	    echo -n ' named';		named ${named_flags}
+	    echo -n ' named';		${named_program-"named"} ${named_flags}
     fi
 
     if [ "X${ntpdate_enable}" = X"YES" ]; then
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index eac6f3f..f26fbd4 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.13 1997/12/01 06:11:34 obrien Exp $
+#	$Id: rc.network,v 1.14 1998/01/10 03:33:39 alex Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -138,7 +138,7 @@ network_pass1() {
 network_pass2() {
     echo -n 'Doing additional network setup:'
     if [ "X${named_enable}" = X"YES" ]; then
-	    echo -n ' named';		named ${named_flags}
+	    echo -n ' named';		${named_program-"named"} ${named_flags}
     fi
 
     if [ "X${ntpdate_enable}" = X"YES" ]; then
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index eac6f3f..f26fbd4 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.13 1997/12/01 06:11:34 obrien Exp $
+#	$Id: rc.network,v 1.14 1998/01/10 03:33:39 alex Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -138,7 +138,7 @@ network_pass1() {
 network_pass2() {
     echo -n 'Doing additional network setup:'
     if [ "X${named_enable}" = X"YES" ]; then
-	    echo -n ' named';		named ${named_flags}
+	    echo -n ' named';		${named_program-"named"} ${named_flags}
     fi
 
     if [ "X${ntpdate_enable}" = X"YES" ]; then
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index eac6f3f..f26fbd4 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.13 1997/12/01 06:11:34 obrien Exp $
+#	$Id: rc.network,v 1.14 1998/01/10 03:33:39 alex Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -138,7 +138,7 @@ network_pass1() {
 network_pass2() {
     echo -n 'Doing additional network setup:'
     if [ "X${named_enable}" = X"YES" ]; then
-	    echo -n ' named';		named ${named_flags}
+	    echo -n ' named';		${named_program-"named"} ${named_flags}
     fi
 
     if [ "X${ntpdate_enable}" = X"YES" ]; then
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index eac6f3f..f26fbd4 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.13 1997/12/01 06:11:34 obrien Exp $
+#	$Id: rc.network,v 1.14 1998/01/10 03:33:39 alex Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -138,7 +138,7 @@ network_pass1() {
 network_pass2() {
     echo -n 'Doing additional network setup:'
     if [ "X${named_enable}" = X"YES" ]; then
-	    echo -n ' named';		named ${named_flags}
+	    echo -n ' named';		${named_program-"named"} ${named_flags}
     fi
 
     if [ "X${ntpdate_enable}" = X"YES" ]; then
diff --git a/etc/rc.network b/etc/rc.network
index eac6f3f..f26fbd4 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.13 1997/12/01 06:11:34 obrien Exp $
+#	$Id: rc.network,v 1.14 1998/01/10 03:33:39 alex Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -138,7 +138,7 @@ network_pass1() {
 network_pass2() {
     echo -n 'Doing additional network setup:'
     if [ "X${named_enable}" = X"YES" ]; then
-	    echo -n ' named';		named ${named_flags}
+	    echo -n ' named';		${named_program-"named"} ${named_flags}
     fi
 
     if [ "X${ntpdate_enable}" = X"YES" ]; then