[src/netbsd-1-5]: src/etc Move options into 'ntp_flags', to make it possible ...

[abs <abs%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/596d2f0e9b1a
branches:  netbsd-1-5
changeset: 489145:596d2f0e9b1a
user:      abs <abs%NetBSD.org@localhost>
date:      Mon Aug 21 15:02:49 2000 +0000

description:
Move options into 'ntp_flags', to make it possible to add '-u'
without having to modify rc.d/ntpdate
Pullup, approved by thorpej:
        etc/rc.conf             1.93
        etc/rc.d/ntpdate        1.5

diffstat:

 etc/rc.conf      |  5 +++--
 etc/rc.d/ntpdate |  4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r 780e5f7371e3 -r 596d2f0e9b1a etc/rc.conf
--- a/etc/rc.conf       Mon Aug 21 05:33:27 2000 +0000
+++ b/etc/rc.conf       Mon Aug 21 15:02:49 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: rc.conf,v 1.85.2.5 2000/08/09 18:35:00 lukem Exp $
+#      $NetBSD: rc.conf,v 1.85.2.6 2000/08/21 15:02:49 abs Exp $
 #
 # see rc.conf(5) for more information.
 #
@@ -85,7 +85,8 @@
 flushroutes=YES                                        # flush routes in netstart
 dhclient=NO                                    # behave as a DHCP client
 dhclient_flags=""                              # blank: config all interfaces
-ntpdate=NO             ntpdate_hosts=""        # blank: hosts in /etc/ntp.conf
+ntpdate=NO             ntpdate_flags="-b -s"   # May need '-u' thru firewall
+                       ntpdate_hosts=""        # blank: hosts in /etc/ntp.conf
 ppp_peers=""                                   # /etc/ppp/peers to call
 ip6mode=host                                   # host, autohost or router
 rtsol=NO               rtsol_flags=""          # for ip6mode=autohost only
diff -r 780e5f7371e3 -r 596d2f0e9b1a etc/rc.d/ntpdate
--- a/etc/rc.d/ntpdate  Mon Aug 21 05:33:27 2000 +0000
+++ b/etc/rc.d/ntpdate  Mon Aug 21 15:02:49 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: ntpdate,v 1.3.4.1 2000/08/09 19:09:44 lukem Exp $
+# $NetBSD: ntpdate,v 1.3.4.2 2000/08/21 15:02:50 abs Exp $
 #
 
 # PROVIDE: ntpdate
@@ -23,7 +23,7 @@
        fi
        if [ -n "$ntpdate_hosts"  ]; then
                echo "Setting date via ntp."
-               ntpdate -b -s $ntpdate_hosts
+               ntpdate $ntpdate_flags $ntpdate_hosts
        fi
 }