OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 07-Aug-2003 10:50:54 Branch: HEAD Handle: 2003080709505201 Modified files: openpkg-src/ntp ntp.spec rc.ntp openpkg-web news.txt Log: use rcService for checking enable, usable and active only; fix PR#232 Summary: Revision Changes Path 1.51 +1 -1 openpkg-src/ntp/ntp.spec 1.20 +5 -5 openpkg-src/ntp/rc.ntp 1.6067 +1 -0 openpkg-web/news.txt ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/ntp/ntp.spec ============================================================================ $ cvs diff -u -r1.50 -r1.51 ntp.spec --- openpkg-src/ntp/ntp.spec 23 Jul 2003 13:32:07 -0000 1.50 +++ openpkg-src/ntp/ntp.spec 7 Aug 2003 08:50:53 -0000 1.51 @@ -33,7 +33,7 @@ Group: Network License: BSD-style Version: 4.1.2 -Release: 20030723 +Release: 20030807 # package options %option with_fsl yes @@ . patch -p0 <<'@@ .' Index: openpkg-src/ntp/rc.ntp ============================================================================ $ cvs diff -u -r1.19 -r1.20 rc.ntp --- openpkg-src/ntp/rc.ntp 22 Jul 2003 09:21:22 -0000 1.19 +++ openpkg-src/ntp/rc.ntp 7 Aug 2003 08:50:53 -0000 1.20 @@ -37,14 +37,14 @@ # on startup, force synchronize local machine # because ntpd does not skip large time offsets # the "active" short circuit above does not hurt - if rcService ntp ostart yes; then + if rcVarIsYes ntp_ostart; then @l_prefix@/bin/ntpdate \ `grep "^server" @l_prefix@/etc/ntp/ntp.conf |\ awk '{ printf(" %s", $2); }'` fi # run the NTP daemon for continued synchronization - if rcService ntp daemon yes; then + if rcVarIsYes ntp_daemon; then @l_prefix@/bin/ntpd \ -p @l_prefix@/var/ntp/ntpd.pid \ -f @l_prefix@/var/ntp/ntpd.drift \ @@ -54,19 +54,19 @@ %stop -u @l_susr@ rcService ntp enable yes || exit 0 rcService ntp active no && exit 0 - rcService ntp daemon yes || exit 0 + rcVarIsYes ntp_daemon || exit 0 ntp_signal TERM rm -f $ntp_pidfile 2>/dev/null || true %restart -p 200 -u @l_susr@ rcService ntp enable yes || exit 0 rcService ntp active no && exit 0 - rcService ntp daemon yes || exit 0 + rcVarIsYes ntp_daemon || exit 0 rc ntp stop start %hourly -u @l_susr@ rcService ntp enable yes || exit 0 - rcService ntp hourly yes || exit 0 + rcVarIsYes ntp_hourly || exit 0 # synchronize local machine every hour # because ntpd does not skip large time offsets @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt ============================================================================ $ cvs diff -u -r1.6066 -r1.6067 news.txt --- openpkg-web/news.txt 7 Aug 2003 08:42:42 -0000 1.6066 +++ openpkg-web/news.txt 7 Aug 2003 08:50:52 -0000 1.6067 @@ -1,3 +1,4 @@ +07-Aug-2003: Upgraded package: P<ntp-4.1.2-20030807> 07-Aug-2003: Upgraded package: P<uvscan-4.1.6.4283-20030807> 07-Aug-2003: Upgraded package: P<grepmail-5.10-20030807> 06-Aug-2003: Upgraded package: P<gcc34-3.4s20030806-20030806> @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]