Add an additional `named_program' variable so that we can easily choose
between 4.9.6 and the port of 8.x.
This commit is contained in:
parent
8baab29a23
commit
0da25c39b2
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=32949
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh -
|
#!/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
|
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
|
||||||
|
|
||||||
# Note that almost all the user-configurable behavior is no longer in
|
# Note that almost all the user-configurable behavior is no longer in
|
||||||
@ -138,7 +138,7 @@ network_pass1() {
|
|||||||
network_pass2() {
|
network_pass2() {
|
||||||
echo -n 'Doing additional network setup:'
|
echo -n 'Doing additional network setup:'
|
||||||
if [ "X${named_enable}" = X"YES" ]; then
|
if [ "X${named_enable}" = X"YES" ]; then
|
||||||
echo -n ' named'; named ${named_flags}
|
echo -n ' named'; ${named_program-"named"} ${named_flags}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
#
|
#
|
||||||
# All arguments must be in double or single quotes.
|
# 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 #####################
|
### 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_enable="YES" # Run the network daemon dispatcher (or NO).
|
||||||
inetd_flags="" # Optional flags to inetd.
|
inetd_flags="" # Optional flags to inetd.
|
||||||
named_enable="NO" # Run named, the DNS server (or NO).
|
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).
|
named_flags="-b /etc/namedb/named.boot" # Flags to named (if enabled).
|
||||||
kerberos_server_enable="NO" # Run a kerberos master server (or NO).
|
kerberos_server_enable="NO" # Run a kerberos master server (or NO).
|
||||||
kadmind_server_enable="NO" # Run kadmind (or NO) -- do not run on
|
kadmind_server_enable="NO" # Run kadmind (or NO) -- do not run on
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh -
|
#!/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
|
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
|
||||||
|
|
||||||
# Note that almost all the user-configurable behavior is no longer in
|
# Note that almost all the user-configurable behavior is no longer in
|
||||||
@ -138,7 +138,7 @@ network_pass1() {
|
|||||||
network_pass2() {
|
network_pass2() {
|
||||||
echo -n 'Doing additional network setup:'
|
echo -n 'Doing additional network setup:'
|
||||||
if [ "X${named_enable}" = X"YES" ]; then
|
if [ "X${named_enable}" = X"YES" ]; then
|
||||||
echo -n ' named'; named ${named_flags}
|
echo -n ' named'; ${named_program-"named"} ${named_flags}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh -
|
#!/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
|
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
|
||||||
|
|
||||||
# Note that almost all the user-configurable behavior is no longer in
|
# Note that almost all the user-configurable behavior is no longer in
|
||||||
@ -138,7 +138,7 @@ network_pass1() {
|
|||||||
network_pass2() {
|
network_pass2() {
|
||||||
echo -n 'Doing additional network setup:'
|
echo -n 'Doing additional network setup:'
|
||||||
if [ "X${named_enable}" = X"YES" ]; then
|
if [ "X${named_enable}" = X"YES" ]; then
|
||||||
echo -n ' named'; named ${named_flags}
|
echo -n ' named'; ${named_program-"named"} ${named_flags}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh -
|
#!/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
|
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
|
||||||
|
|
||||||
# Note that almost all the user-configurable behavior is no longer in
|
# Note that almost all the user-configurable behavior is no longer in
|
||||||
@ -138,7 +138,7 @@ network_pass1() {
|
|||||||
network_pass2() {
|
network_pass2() {
|
||||||
echo -n 'Doing additional network setup:'
|
echo -n 'Doing additional network setup:'
|
||||||
if [ "X${named_enable}" = X"YES" ]; then
|
if [ "X${named_enable}" = X"YES" ]; then
|
||||||
echo -n ' named'; named ${named_flags}
|
echo -n ' named'; ${named_program-"named"} ${named_flags}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh -
|
#!/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
|
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
|
||||||
|
|
||||||
# Note that almost all the user-configurable behavior is no longer in
|
# Note that almost all the user-configurable behavior is no longer in
|
||||||
@ -138,7 +138,7 @@ network_pass1() {
|
|||||||
network_pass2() {
|
network_pass2() {
|
||||||
echo -n 'Doing additional network setup:'
|
echo -n 'Doing additional network setup:'
|
||||||
if [ "X${named_enable}" = X"YES" ]; then
|
if [ "X${named_enable}" = X"YES" ]; then
|
||||||
echo -n ' named'; named ${named_flags}
|
echo -n ' named'; ${named_program-"named"} ${named_flags}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh -
|
#!/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
|
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
|
||||||
|
|
||||||
# Note that almost all the user-configurable behavior is no longer in
|
# Note that almost all the user-configurable behavior is no longer in
|
||||||
@ -138,7 +138,7 @@ network_pass1() {
|
|||||||
network_pass2() {
|
network_pass2() {
|
||||||
echo -n 'Doing additional network setup:'
|
echo -n 'Doing additional network setup:'
|
||||||
if [ "X${named_enable}" = X"YES" ]; then
|
if [ "X${named_enable}" = X"YES" ]; then
|
||||||
echo -n ' named'; named ${named_flags}
|
echo -n ' named'; ${named_program-"named"} ${named_flags}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh -
|
#!/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
|
# From: @(#)netstart 5.9 (Berkeley) 3/30/91
|
||||||
|
|
||||||
# Note that almost all the user-configurable behavior is no longer in
|
# Note that almost all the user-configurable behavior is no longer in
|
||||||
@ -138,7 +138,7 @@ network_pass1() {
|
|||||||
network_pass2() {
|
network_pass2() {
|
||||||
echo -n 'Doing additional network setup:'
|
echo -n 'Doing additional network setup:'
|
||||||
if [ "X${named_enable}" = X"YES" ]; then
|
if [ "X${named_enable}" = X"YES" ]; then
|
||||||
echo -n ' named'; named ${named_flags}
|
echo -n ' named'; ${named_program-"named"} ${named_flags}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user