diff --git a/etc/network.subr b/etc/network.subr index 9e0211f00078..214efd27c43a 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.22 1998/04/18 10:27:06 brian Exp $ +# $Id: rc.network,v 1.23 1998/04/26 06:32:13 phk 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 ${ntpdate_flags} >/dev/null 2>&1 + echo -n ' ntpdate'; ${ntpdate_prog} ${ntpdate_flags} >/dev/null 2>&1 fi if [ "X${xntpd_enable}" = X"YES" ]; then - echo -n ' xntpd'; xntpd ${xntpd_flags} + echo -n ' xntpd'; ${xntpd_prog} ${xntpd_flags} fi if [ "X${timed_enable}" = X"YES" ]; then diff --git a/etc/rc.conf b/etc/rc.conf index 82d75a34730c..c179685f414c 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.47 1998/05/01 13:45:00 peter Exp $ +# $Id: rc.conf,v 1.48 1998/05/04 05:26:46 peter Exp $ ############################################################## ### Important initial Boot-time options ##################### @@ -78,8 +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_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_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 9e0211f00078..214efd27c43a 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.22 1998/04/18 10:27:06 brian Exp $ +# $Id: rc.network,v 1.23 1998/04/26 06:32:13 phk 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 ${ntpdate_flags} >/dev/null 2>&1 + echo -n ' ntpdate'; ${ntpdate_prog} ${ntpdate_flags} >/dev/null 2>&1 fi if [ "X${xntpd_enable}" = X"YES" ]; then - echo -n ' xntpd'; xntpd ${xntpd_flags} + echo -n ' xntpd'; ${xntpd_prog} ${xntpd_flags} fi if [ "X${timed_enable}" = X"YES" ]; then diff --git a/etc/rc.d/network1 b/etc/rc.d/network1 index 9e0211f00078..214efd27c43a 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.22 1998/04/18 10:27:06 brian Exp $ +# $Id: rc.network,v 1.23 1998/04/26 06:32:13 phk 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 ${ntpdate_flags} >/dev/null 2>&1 + echo -n ' ntpdate'; ${ntpdate_prog} ${ntpdate_flags} >/dev/null 2>&1 fi if [ "X${xntpd_enable}" = X"YES" ]; then - echo -n ' xntpd'; xntpd ${xntpd_flags} + echo -n ' xntpd'; ${xntpd_prog} ${xntpd_flags} fi if [ "X${timed_enable}" = X"YES" ]; then diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 index 9e0211f00078..214efd27c43a 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.22 1998/04/18 10:27:06 brian Exp $ +# $Id: rc.network,v 1.23 1998/04/26 06:32:13 phk 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 ${ntpdate_flags} >/dev/null 2>&1 + echo -n ' ntpdate'; ${ntpdate_prog} ${ntpdate_flags} >/dev/null 2>&1 fi if [ "X${xntpd_enable}" = X"YES" ]; then - echo -n ' xntpd'; xntpd ${xntpd_flags} + echo -n ' xntpd'; ${xntpd_prog} ${xntpd_flags} fi if [ "X${timed_enable}" = X"YES" ]; then diff --git a/etc/rc.d/network3 b/etc/rc.d/network3 index 9e0211f00078..214efd27c43a 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.22 1998/04/18 10:27:06 brian Exp $ +# $Id: rc.network,v 1.23 1998/04/26 06:32:13 phk 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 ${ntpdate_flags} >/dev/null 2>&1 + echo -n ' ntpdate'; ${ntpdate_prog} ${ntpdate_flags} >/dev/null 2>&1 fi if [ "X${xntpd_enable}" = X"YES" ]; then - echo -n ' xntpd'; xntpd ${xntpd_flags} + echo -n ' xntpd'; ${xntpd_prog} ${xntpd_flags} fi if [ "X${timed_enable}" = X"YES" ]; then diff --git a/etc/rc.d/routing b/etc/rc.d/routing index 9e0211f00078..214efd27c43a 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.22 1998/04/18 10:27:06 brian Exp $ +# $Id: rc.network,v 1.23 1998/04/26 06:32:13 phk 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 ${ntpdate_flags} >/dev/null 2>&1 + echo -n ' ntpdate'; ${ntpdate_prog} ${ntpdate_flags} >/dev/null 2>&1 fi if [ "X${xntpd_enable}" = X"YES" ]; then - echo -n ' xntpd'; xntpd ${xntpd_flags} + echo -n ' xntpd'; ${xntpd_prog} ${xntpd_flags} fi if [ "X${timed_enable}" = X"YES" ]; then diff --git a/etc/rc.network b/etc/rc.network index 9e0211f00078..214efd27c43a 100644 --- a/etc/rc.network +++ b/etc/rc.network @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.22 1998/04/18 10:27:06 brian Exp $ +# $Id: rc.network,v 1.23 1998/04/26 06:32:13 phk 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 ${ntpdate_flags} >/dev/null 2>&1 + echo -n ' ntpdate'; ${ntpdate_prog} ${ntpdate_flags} >/dev/null 2>&1 fi if [ "X${xntpd_enable}" = X"YES" ]; then - echo -n ' xntpd'; xntpd ${xntpd_flags} + echo -n ' xntpd'; ${xntpd_prog} ${xntpd_flags} fi if [ "X${timed_enable}" = X"YES" ]; then