From 90f94d55c1daf486f49203d88bcf298eb7499b65 Mon Sep 17 00:00:00 2001 From: Andreas Klemm Date: Wed, 6 May 1998 17:36:16 +0000 Subject: [PATCH] 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. --- etc/network.subr | 6 +++--- etc/rc.conf | 6 +++--- etc/rc.d/netoptions | 6 +++--- etc/rc.d/network1 | 6 +++--- etc/rc.d/network2 | 6 +++--- etc/rc.d/network3 | 6 +++--- etc/rc.d/routing | 6 +++--- etc/rc.network | 6 +++--- share/man/man5/rc.conf.5 | 8 ++++---- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/etc/network.subr b/etc/network.subr index 214efd27c43a..4f22a9a1096a 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -1,6 +1,6 @@ #!/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 # Note that almost all the user-configurable behavior is no longer in @@ -160,11 +160,11 @@ network_pass2() { fi 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 if [ "X${xntpd_enable}" = X"YES" ]; then - echo -n ' xntpd'; ${xntpd_prog} ${xntpd_flags} + echo -n ' xntpd'; ${xntpd_program} ${xntpd_flags} fi if [ "X${timed_enable}" = X"YES" ]; then diff --git a/etc/rc.conf b/etc/rc.conf index c179685f414c..aebe94c2539a 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.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 ##################### @@ -78,10 +78,10 @@ xtend_flags="" # Flags to xtend (if enabled). timed_enable="NO" # Run the time daemon (or NO). timed_flags="" # Flags to timed (if enabled). 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). 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). tickadj_enable="NO" # Run tickadj (or NO). tickadj_flags="-Aq" # Flags to tickadj (if enabled). diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index 214efd27c43a..4f22a9a1096a 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -1,6 +1,6 @@ #!/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 # Note that almost all the user-configurable behavior is no longer in @@ -160,11 +160,11 @@ network_pass2() { fi 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 if [ "X${xntpd_enable}" = X"YES" ]; then - echo -n ' xntpd'; ${xntpd_prog} ${xntpd_flags} + echo -n ' xntpd'; ${xntpd_program} ${xntpd_flags} fi if [ "X${timed_enable}" = X"YES" ]; then diff --git a/etc/rc.d/network1 b/etc/rc.d/network1 index 214efd27c43a..4f22a9a1096a 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -1,6 +1,6 @@ #!/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 # Note that almost all the user-configurable behavior is no longer in @@ -160,11 +160,11 @@ network_pass2() { fi 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 if [ "X${xntpd_enable}" = X"YES" ]; then - echo -n ' xntpd'; ${xntpd_prog} ${xntpd_flags} + echo -n ' xntpd'; ${xntpd_program} ${xntpd_flags} fi if [ "X${timed_enable}" = X"YES" ]; then diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 index 214efd27c43a..4f22a9a1096a 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -1,6 +1,6 @@ #!/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 # Note that almost all the user-configurable behavior is no longer in @@ -160,11 +160,11 @@ network_pass2() { fi 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 if [ "X${xntpd_enable}" = X"YES" ]; then - echo -n ' xntpd'; ${xntpd_prog} ${xntpd_flags} + echo -n ' xntpd'; ${xntpd_program} ${xntpd_flags} fi if [ "X${timed_enable}" = X"YES" ]; then diff --git a/etc/rc.d/network3 b/etc/rc.d/network3 index 214efd27c43a..4f22a9a1096a 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -1,6 +1,6 @@ #!/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 # Note that almost all the user-configurable behavior is no longer in @@ -160,11 +160,11 @@ network_pass2() { fi 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 if [ "X${xntpd_enable}" = X"YES" ]; then - echo -n ' xntpd'; ${xntpd_prog} ${xntpd_flags} + echo -n ' xntpd'; ${xntpd_program} ${xntpd_flags} fi if [ "X${timed_enable}" = X"YES" ]; then diff --git a/etc/rc.d/routing b/etc/rc.d/routing index 214efd27c43a..4f22a9a1096a 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -1,6 +1,6 @@ #!/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 # Note that almost all the user-configurable behavior is no longer in @@ -160,11 +160,11 @@ network_pass2() { fi 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 if [ "X${xntpd_enable}" = X"YES" ]; then - echo -n ' xntpd'; ${xntpd_prog} ${xntpd_flags} + echo -n ' xntpd'; ${xntpd_program} ${xntpd_flags} fi if [ "X${timed_enable}" = X"YES" ]; then diff --git a/etc/rc.network b/etc/rc.network index 214efd27c43a..4f22a9a1096a 100644 --- a/etc/rc.network +++ b/etc/rc.network @@ -1,6 +1,6 @@ #!/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 # Note that almost all the user-configurable behavior is no longer in @@ -160,11 +160,11 @@ network_pass2() { fi 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 if [ "X${xntpd_enable}" = X"YES" ]; then - echo -n ' xntpd'; ${xntpd_prog} ${xntpd_flags} + echo -n ' xntpd'; ${xntpd_program} ${xntpd_flags} fi if [ "X${timed_enable}" = X"YES" ]; then diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 1fa5a9e3cb81..b54806d7f5f4 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" 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 .Dt RC.CONF 5 @@ -214,7 +214,7 @@ these are the flags to pass to run the .Xr named 8 daemon. -.It Ar named_prog +.It Ar named_program (str) path to .Xr named 8 (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 .Pa /stand/sysinstall program when the system is first installed. -.It Ar ntpdate_prog +.It Ar ntpdate_program (str) path to .Xr ntpdate 8 (default @@ -391,7 +391,7 @@ command (typically a hostname). then run the .Xr xntpd 8 command at boot time. -.It Ar xntpd_prog +.It Ar xntpd_program (str) path to .Xr xntpd 8 (default