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: 09-Jul-2003 14:25:20
Branch: HEAD Handle: 2003070913251901
Modified files:
openpkg-src/ntp ntp.spec rc.ntp
openpkg-web news.txt
Log:
cleanup run-command script
Summary:
Revision Changes Path
1.40 +1 -1 openpkg-src/ntp/ntp.spec
1.12 +54 -47 openpkg-src/ntp/rc.ntp
1.5464 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ntp/ntp.spec
============================================================================
$ cvs diff -u -r1.39 -r1.40 ntp.spec
--- openpkg-src/ntp/ntp.spec 8 Jul 2003 14:41:18 -0000 1.39
+++ openpkg-src/ntp/ntp.spec 9 Jul 2003 12:25:20 -0000 1.40
@@ -33,7 +33,7 @@
Group: Network
License: BSD-style
Version: 4.1.1c
-Release: 20030708
+Release: 20030709
# package options
%option with_fsl yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ntp/rc.ntp
============================================================================
$ cvs diff -u -r1.11 -r1.12 rc.ntp
--- openpkg-src/ntp/rc.ntp 7 Jul 2003 22:01:42 -0000 1.11
+++ openpkg-src/ntp/rc.ntp 9 Jul 2003 12:25:20 -0000 1.12
@@ -21,69 +21,76 @@
%start -p 200 -u @l_susr@
opServiceEnabled ntp || exit 0
+
# synchronize local machine once at startup
# because ntpd does not skip large time offsets
@l_prefix@/bin/ntpdate \
`grep "^server" @l_prefix@/etc/ntp/ntp.conf |\
awk '{ printf(" %s", $2); }'`
- opVarIsYes ntp_daemon || exit 0
+
# run the NTP daemon for continued synchronization
- @l_prefix@/bin/ntpd \
- -p @l_prefix@/var/ntp/ntpd.pid \
- -f @l_prefix@/var/ntp/ntpd.drift \
- -s @l_prefix@/var/ntp/ntpd.stat/
+ if opVarIsYes ntp_daemon; then
+ @l_prefix@/bin/ntpd \
+ -p @l_prefix@/var/ntp/ntpd.pid \
+ -f @l_prefix@/var/ntp/ntpd.drift \
+ -s @l_prefix@/var/ntp/ntpd.stat/
+ fi
%stop -p 200 -u @l_susr@
- opServiceEnabled ntp && opVarIsYes ntp_daemon || exit 0
- ntp_signal TERM
+ opServiceEnabled ntp || exit 0
+ if opVarIsYes ntp_daemon; then
+ ntp_signal TERM
+ fi
%restart -u @l_susr@
- opServiceEnabled ntp && opVarIsYes ntp_daemon || exit 0
- ntp_signal TERM
- sleep 2
- # restart the NTP daemon for continued synchronization
- @l_prefix@/bin/ntpd \
- -p @l_prefix@/var/ntp/ntpd.pid \
- -f @l_prefix@/var/ntp/ntpd.drift \
- -s @l_prefix@/var/ntp/ntpd.stat/
-
-%hourly -u @l_susr@
opServiceEnabled ntp || exit 0
- opVarIsYes ntp_daemon && exit 0
- (
- sleep 30
- @l_prefix@/bin/ntpdate \
- `grep "^server" @l_prefix@/etc/ntp/ntp.conf |\
- awk '{ printf(" %s", $2); }'`
- ) >/dev/null &
-
-%daily -u @l_susr@
- opServiceEnabled ntp && opVarIsYes ntp_daemon || exit 0
- opTmpDirGen ntp
- opTmpDirFile ntp hint hintfile
- prolog="true"
- if [ ".$ntp_log_prolog" != . ]; then
- prolog="$prolog; $ntp_log_prolog"
- fi
- epilog="echo 'epilog' >$hintfile"
- if [ ".$ntp_log_epilog" != . ]; then
- epilog="$epilog; $ntp_log_epilog"
- fi
- shtool rotate -f \
- -n${ntp_log_numfiles} -s${ntp_log_minsize} \
- -d -z${ntp_log_complevel} \
- [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
- -P "$prolog" \
- -E "$epilog" \
- @l_prefix@/var/ntp/ntp.log
- if [ ".`cat $hintfile`" = ".epilog" ]; then
+ if opVarIsYes ntp_daemon; then
ntp_signal TERM
sleep 2
- # restart the NTP daemon
@l_prefix@/bin/ntpd \
-p @l_prefix@/var/ntp/ntpd.pid \
-f @l_prefix@/var/ntp/ntpd.drift \
-s @l_prefix@/var/ntp/ntpd.stat/
fi
- opTmpDirDel ntp
+
+%hourly -u @l_susr@
+ opServiceEnabled ntp || exit 0
+ if ! opVarIsYes ntp_daemon; then
+ ( sleep 30
+ @l_prefix@/bin/ntpdate \
+ `grep "^server" @l_prefix@/etc/ntp/ntp.conf |\
+ awk '{ printf(" %s", $2); }'`
+ ) >/dev/null &
+ fi
+
+%daily -u @l_susr@
+ opServiceEnabled ntp || exit 0
+ if opVarIsYes ntp_daemon; then
+ opTmpDirGen ntp
+ opTmpDirFile ntp hint hintfile
+ prolog="true"
+ if [ ".$ntp_log_prolog" != . ]; then
+ prolog="$prolog; $ntp_log_prolog"
+ fi
+ epilog="echo 'epilog' >$hintfile"
+ if [ ".$ntp_log_epilog" != . ]; then
+ epilog="$epilog; $ntp_log_epilog"
+ fi
+ shtool rotate -f \
+ -n${ntp_log_numfiles} -s${ntp_log_minsize} \
+ -d -z${ntp_log_complevel} \
+ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
+ -P "$prolog" \
+ -E "$epilog" \
+ @l_prefix@/var/ntp/ntp.log
+ if [ ".`cat $hintfile`" = ".epilog" ]; then
+ ntp_signal TERM
+ sleep 2
+ @l_prefix@/bin/ntpd \
+ -p @l_prefix@/var/ntp/ntpd.pid \
+ -f @l_prefix@/var/ntp/ntpd.drift \
+ -s @l_prefix@/var/ntp/ntpd.stat/
+ fi
+ opTmpDirDel ntp
+ fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5463 -r1.5464 news.txt
--- openpkg-web/news.txt 9 Jul 2003 10:10:10 -0000 1.5463
+++ openpkg-web/news.txt 9 Jul 2003 12:25:19 -0000 1.5464
@@ -1,3 +1,4 @@
+09-Jul-2003: Upgraded package: P<ntp-4.1.1c-20030709>
09-Jul-2003: Upgraded package: P<exim-4.20-20030709>
09-Jul-2003: Upgraded package: P<tomcat4-adapter-4.1.24-20030709>
09-Jul-2003: Upgraded package: P<apache-1.3.27-20030709>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
