OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 04-Sep-2003 13:28:20
Branch: OPENPKG_1_3_SOLID HEAD Handle: 2003090412281802
Modified files:
openpkg-web news.txt
Modified files: (Branch: OPENPKG_1_3_SOLID)
openpkg-src/ntp ntp.spec rc.ntp
Log:
MFC: enhancements and cleanups to run-commands
Summary:
Revision Changes Path
1.33.2.2.2.2+1 -1 openpkg-src/ntp/ntp.spec
1.6.4.1.2.1 +41 -26 openpkg-src/ntp/rc.ntp
1.6396 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ntp/ntp.spec
============================================================================
$ cvs diff -u -r1.33.2.2.2.1 -r1.33.2.2.2.2 ntp.spec
--- openpkg-src/ntp/ntp.spec 29 Jul 2003 15:00:17 -0000 1.33.2.2.2.1
+++ openpkg-src/ntp/ntp.spec 4 Sep 2003 11:28:20 -0000 1.33.2.2.2.2
@@ -33,7 +33,7 @@
Group: Network
License: BSD-style
Version: 4.1.2
-Release: 1.3.0
+Release: 1.3.1
# package options
%option with_fsl yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ntp/rc.ntp
============================================================================
$ cvs diff -u -r1.6.4.1 -r1.6.4.1.2.1 rc.ntp
--- openpkg-src/ntp/rc.ntp 24 Jul 2003 20:41:58 -0000 1.6.4.1
+++ openpkg-src/ntp/rc.ntp 4 Sep 2003 11:28:20 -0000 1.6.4.1.2.1
@@ -5,9 +5,7 @@
%config
ntp_enable="$openpkg_rc_def"
- ntp_ostart="yes"
- ntp_daemon="yes"
- ntp_hourly="no"
+ ntp_mode="daemon"
ntp_log_prolog="true"
ntp_log_epilog="true"
ntp_log_numfiles="10"
@@ -19,12 +17,18 @@
ntp_signal () {
[ -f $ntp_pidfile ] && kill -$1 `cat $ntp_pidfile`
}
+ ntp_once () {
+ [ ".$1" != . ] && sleep $1
+ @l_prefix@/bin/ntpdate \
+ `grep "^server" @l_prefix@/etc/ntp/ntp.conf |\
+ awk '{ printf(" %s", $2); }'` || true
+ }
%status -u @l_susr@ -o
ntp_usable="unknown"
ntp_active="no"
rcService ntp enable yes && \
- rcVarIsYes ntp_daemon && \
+ [ ".$ntp_mode" = ".daemon" ] && \
ntp_signal 0 && ntp_active="yes"
echo "ntp_enable=\"$ntp_enable\""
echo "ntp_usable=\"$ntp_usable\""
@@ -34,17 +38,21 @@
rcService ntp enable yes || exit 0
rcService ntp active yes && exit 0
- # 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
- @l_prefix@/bin/ntpdate \
- `grep "^server" @l_prefix@/etc/ntp/ntp.conf |\
- awk '{ printf(" %s", $2); }'`
- fi
+ # under both periodical and daemon mode, synchronize local machine
+ # once manually -- either to fill the gap between startup time and
+ # the first run of the cron jobs (periodical mode) or to perform
+ # a possible large time offset which ntpd does not perform itself
+ # (daemon mode).
+ case "$ntp_mode" in
+ once | \
+ daemon | \
+ quarterly | hourly | daily | weekly | monthly )
+ ntp_once
+ ;;
+ esac
# run the NTP daemon for continued synchronization
- if rcService ntp daemon yes; then
+ if [ ".$ntp_mode" = .daemon ]; then
@l_prefix@/bin/ntpd \
-p @l_prefix@/var/ntp/ntpd.pid \
-f @l_prefix@/var/ntp/ntpd.drift \
@@ -54,35 +62,42 @@
%stop -u @l_susr@
rcService ntp enable yes || exit 0
rcService ntp active no && exit 0
- rcService ntp daemon yes || 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
rc ntp stop start
-%hourly -u @l_susr@
+%quarterly -p 800 -u @l_susr@
rcService ntp enable yes || exit 0
- rcService ntp hourly yes || exit 0
+ [ ".$ntp_mode" = .quarterly ] && ntp_once 30
+ exit 0
- # synchronize local machine every hour
- # because ntpd does not skip large time offsets
- # and to allow operation without daemon
- @l_prefix@/bin/ntpdate \
- `grep "^server" @l_prefix@/etc/ntp/ntp.conf |\
- awk '{ printf(" %s", $2); }'` >/dev/null
-
-%daily -u @l_susr@
+%hourly -p 800 -u @l_susr@
rcService ntp enable yes || exit 0
+ [ ".$ntp_mode" = .hourly ] && ntp_once 30
+ exit 0
- # rotate logfile
+%daily -p 800 -u @l_susr@
+ rcService ntp enable yes || exit 0
+ [ ".$ntp_mode" = .daily ] && ntp_once 30
shtool rotate -f \
-n ${ntp_log_numfiles} -s ${ntp_log_minsize} -d \
-z ${ntp_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
-P "${ntp_log_prolog}" \
-E "${ntp_log_epilog} && rc ntp restart" \
@l_prefix@/var/ntp/ntp.log
+ exit 0
+
+%weekly -p 800 -u @l_susr@
+ rcService ntp enable yes || exit 0
+ [ ".$ntp_mode" = .weekly ] && ntp_once 30
+ exit 0
+
+%monthly -p 800 -u @l_susr@
+ rcService ntp enable yes || exit 0
+ [ ".$ntp_mode" = .monthly ] && ntp_once 30
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6395 -r1.6396 news.txt
--- openpkg-web/news.txt 4 Sep 2003 10:55:02 -0000 1.6395
+++ openpkg-web/news.txt 4 Sep 2003 11:28:18 -0000 1.6396
@@ -1,3 +1,4 @@
+04-Sep-2003: Upgraded package: P<ntp-4.1.2-1.3.1>
04-Sep-2003: Upgraded package: P<perl-mail-20030904-20030904>
04-Sep-2003: Upgraded package: P<autogen-5.5.6-20030904>
04-Sep-2003: Upgraded package: P<uvscan-4.24+4291-20030904>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
