Overlooked, that newer naming convention is xxx_program instead of xxx_prog.
So changed it to ntpdate_program and xntpd_program. Backout last change, now we have again named_program, sorry.
This commit is contained in:
parent
86e0adfea1
commit
90f94d55c1
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=35787
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh -
|
#!/bin/sh -
|
||||||
#
|
#
|
||||||
# $Id: rc.network,v 1.23 1998/04/26 06:32:13 phk Exp $
|
# $Id: rc.network,v 1.24 1998/05/05 21:14:27 andreas 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
|
||||||
@ -160,11 +160,11 @@ network_pass2() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
||||||
echo -n ' ntpdate'; ${ntpdate_prog} ${ntpdate_flags} >/dev/null 2>&1
|
echo -n ' ntpdate'; ${ntpdate_program} ${ntpdate_flags} >/dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${xntpd_enable}" = X"YES" ]; then
|
if [ "X${xntpd_enable}" = X"YES" ]; then
|
||||||
echo -n ' xntpd'; ${xntpd_prog} ${xntpd_flags}
|
echo -n ' xntpd'; ${xntpd_program} ${xntpd_flags}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${timed_enable}" = X"YES" ]; then
|
if [ "X${timed_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.48 1998/05/04 05:26:46 peter Exp $
|
# $Id: rc.conf,v 1.49 1998/05/05 21:14:27 andreas Exp $
|
||||||
|
|
||||||
##############################################################
|
##############################################################
|
||||||
### Important initial Boot-time options #####################
|
### Important initial Boot-time options #####################
|
||||||
@ -78,10 +78,10 @@ xtend_flags="" # Flags to xtend (if enabled).
|
|||||||
timed_enable="NO" # Run the time daemon (or NO).
|
timed_enable="NO" # Run the time daemon (or NO).
|
||||||
timed_flags="" # Flags to timed (if enabled).
|
timed_flags="" # Flags to timed (if enabled).
|
||||||
ntpdate_enable="NO" # Run the ntpdate to sync time (or NO).
|
ntpdate_enable="NO" # Run the ntpdate to sync time (or NO).
|
||||||
ntpdate_prog="ntpdate" # path to ntpdate, if you want a different one.
|
ntpdate_program="ntpdate" # path to ntpdate, if you want a different one.
|
||||||
ntpdate_flags="" # Flags to ntpdate (if enabled).
|
ntpdate_flags="" # Flags to ntpdate (if enabled).
|
||||||
xntpd_enable="NO" # Run xntpd Network Time Protocol (or NO).
|
xntpd_enable="NO" # Run xntpd Network Time Protocol (or NO).
|
||||||
xntpd_prog="xntpd" # path to xntpd, if you want a different one.
|
xntpd_program="xntpd" # path to xntpd, if you want a different one.
|
||||||
xntpd_flags="" # Flags to xntpd (if enabled).
|
xntpd_flags="" # Flags to xntpd (if enabled).
|
||||||
tickadj_enable="NO" # Run tickadj (or NO).
|
tickadj_enable="NO" # Run tickadj (or NO).
|
||||||
tickadj_flags="-Aq" # Flags to tickadj (if enabled).
|
tickadj_flags="-Aq" # Flags to tickadj (if enabled).
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh -
|
#!/bin/sh -
|
||||||
#
|
#
|
||||||
# $Id: rc.network,v 1.23 1998/04/26 06:32:13 phk Exp $
|
# $Id: rc.network,v 1.24 1998/05/05 21:14:27 andreas 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
|
||||||
@ -160,11 +160,11 @@ network_pass2() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
||||||
echo -n ' ntpdate'; ${ntpdate_prog} ${ntpdate_flags} >/dev/null 2>&1
|
echo -n ' ntpdate'; ${ntpdate_program} ${ntpdate_flags} >/dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${xntpd_enable}" = X"YES" ]; then
|
if [ "X${xntpd_enable}" = X"YES" ]; then
|
||||||
echo -n ' xntpd'; ${xntpd_prog} ${xntpd_flags}
|
echo -n ' xntpd'; ${xntpd_program} ${xntpd_flags}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${timed_enable}" = X"YES" ]; then
|
if [ "X${timed_enable}" = X"YES" ]; then
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh -
|
#!/bin/sh -
|
||||||
#
|
#
|
||||||
# $Id: rc.network,v 1.23 1998/04/26 06:32:13 phk Exp $
|
# $Id: rc.network,v 1.24 1998/05/05 21:14:27 andreas 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
|
||||||
@ -160,11 +160,11 @@ network_pass2() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
||||||
echo -n ' ntpdate'; ${ntpdate_prog} ${ntpdate_flags} >/dev/null 2>&1
|
echo -n ' ntpdate'; ${ntpdate_program} ${ntpdate_flags} >/dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${xntpd_enable}" = X"YES" ]; then
|
if [ "X${xntpd_enable}" = X"YES" ]; then
|
||||||
echo -n ' xntpd'; ${xntpd_prog} ${xntpd_flags}
|
echo -n ' xntpd'; ${xntpd_program} ${xntpd_flags}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${timed_enable}" = X"YES" ]; then
|
if [ "X${timed_enable}" = X"YES" ]; then
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh -
|
#!/bin/sh -
|
||||||
#
|
#
|
||||||
# $Id: rc.network,v 1.23 1998/04/26 06:32:13 phk Exp $
|
# $Id: rc.network,v 1.24 1998/05/05 21:14:27 andreas 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
|
||||||
@ -160,11 +160,11 @@ network_pass2() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
||||||
echo -n ' ntpdate'; ${ntpdate_prog} ${ntpdate_flags} >/dev/null 2>&1
|
echo -n ' ntpdate'; ${ntpdate_program} ${ntpdate_flags} >/dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${xntpd_enable}" = X"YES" ]; then
|
if [ "X${xntpd_enable}" = X"YES" ]; then
|
||||||
echo -n ' xntpd'; ${xntpd_prog} ${xntpd_flags}
|
echo -n ' xntpd'; ${xntpd_program} ${xntpd_flags}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${timed_enable}" = X"YES" ]; then
|
if [ "X${timed_enable}" = X"YES" ]; then
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh -
|
#!/bin/sh -
|
||||||
#
|
#
|
||||||
# $Id: rc.network,v 1.23 1998/04/26 06:32:13 phk Exp $
|
# $Id: rc.network,v 1.24 1998/05/05 21:14:27 andreas 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
|
||||||
@ -160,11 +160,11 @@ network_pass2() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
||||||
echo -n ' ntpdate'; ${ntpdate_prog} ${ntpdate_flags} >/dev/null 2>&1
|
echo -n ' ntpdate'; ${ntpdate_program} ${ntpdate_flags} >/dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${xntpd_enable}" = X"YES" ]; then
|
if [ "X${xntpd_enable}" = X"YES" ]; then
|
||||||
echo -n ' xntpd'; ${xntpd_prog} ${xntpd_flags}
|
echo -n ' xntpd'; ${xntpd_program} ${xntpd_flags}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${timed_enable}" = X"YES" ]; then
|
if [ "X${timed_enable}" = X"YES" ]; then
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh -
|
#!/bin/sh -
|
||||||
#
|
#
|
||||||
# $Id: rc.network,v 1.23 1998/04/26 06:32:13 phk Exp $
|
# $Id: rc.network,v 1.24 1998/05/05 21:14:27 andreas 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
|
||||||
@ -160,11 +160,11 @@ network_pass2() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
||||||
echo -n ' ntpdate'; ${ntpdate_prog} ${ntpdate_flags} >/dev/null 2>&1
|
echo -n ' ntpdate'; ${ntpdate_program} ${ntpdate_flags} >/dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${xntpd_enable}" = X"YES" ]; then
|
if [ "X${xntpd_enable}" = X"YES" ]; then
|
||||||
echo -n ' xntpd'; ${xntpd_prog} ${xntpd_flags}
|
echo -n ' xntpd'; ${xntpd_program} ${xntpd_flags}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${timed_enable}" = X"YES" ]; then
|
if [ "X${timed_enable}" = X"YES" ]; then
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh -
|
#!/bin/sh -
|
||||||
#
|
#
|
||||||
# $Id: rc.network,v 1.23 1998/04/26 06:32:13 phk Exp $
|
# $Id: rc.network,v 1.24 1998/05/05 21:14:27 andreas 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
|
||||||
@ -160,11 +160,11 @@ network_pass2() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
if [ "X${ntpdate_enable}" = X"YES" ]; then
|
||||||
echo -n ' ntpdate'; ${ntpdate_prog} ${ntpdate_flags} >/dev/null 2>&1
|
echo -n ' ntpdate'; ${ntpdate_program} ${ntpdate_flags} >/dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${xntpd_enable}" = X"YES" ]; then
|
if [ "X${xntpd_enable}" = X"YES" ]; then
|
||||||
echo -n ' xntpd'; ${xntpd_prog} ${xntpd_flags}
|
echo -n ' xntpd'; ${xntpd_program} ${xntpd_flags}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "X${timed_enable}" = X"YES" ]; then
|
if [ "X${timed_enable}" = X"YES" ]; then
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
.\" SUCH DAMAGE.
|
.\" SUCH DAMAGE.
|
||||||
.\"
|
.\"
|
||||||
.\" $Id: rc.conf.5,v 1.17 1998/04/18 10:27:19 brian Exp $
|
.\" $Id: rc.conf.5,v 1.18 1998/05/06 17:26:48 andreas Exp $
|
||||||
.\"
|
.\"
|
||||||
.Dd April 26, 1997
|
.Dd April 26, 1997
|
||||||
.Dt RC.CONF 5
|
.Dt RC.CONF 5
|
||||||
@ -214,7 +214,7 @@ these are the flags to pass to
|
|||||||
run the
|
run the
|
||||||
.Xr named 8
|
.Xr named 8
|
||||||
daemon.
|
daemon.
|
||||||
.It Ar named_prog
|
.It Ar named_program
|
||||||
(str) path to
|
(str) path to
|
||||||
.Xr named 8
|
.Xr named 8
|
||||||
(default
|
(default
|
||||||
@ -372,7 +372,7 @@ from some standard reference. An option to set this up initially
|
|||||||
(from a list of known servers) is also provided by the
|
(from a list of known servers) is also provided by the
|
||||||
.Pa /stand/sysinstall
|
.Pa /stand/sysinstall
|
||||||
program when the system is first installed.
|
program when the system is first installed.
|
||||||
.It Ar ntpdate_prog
|
.It Ar ntpdate_program
|
||||||
(str) path to
|
(str) path to
|
||||||
.Xr ntpdate 8
|
.Xr ntpdate 8
|
||||||
(default
|
(default
|
||||||
@ -391,7 +391,7 @@ command (typically a hostname).
|
|||||||
then run the
|
then run the
|
||||||
.Xr xntpd 8
|
.Xr xntpd 8
|
||||||
command at boot time.
|
command at boot time.
|
||||||
.It Ar xntpd_prog
|
.It Ar xntpd_program
|
||||||
(str) path to
|
(str) path to
|
||||||
.Xr xntpd 8
|
.Xr xntpd 8
|
||||||
(default
|
(default
|
||||||
|
Loading…
Reference in New Issue
Block a user