OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 17-Jul-2003 11:49:11
Branch: HEAD Handle: 2003071710490902
Modified files:
openpkg-src/ntp ntp.spec rc.ntp
openpkg-web news.txt
Log:
%status and pidfile handling
Summary:
Revision Changes Path
1.43 +3 -3 openpkg-src/ntp/ntp.spec
1.14 +13 -3 openpkg-src/ntp/rc.ntp
1.5607 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ntp/ntp.spec
============================================================================
$ cvs diff -u -r1.42 -r1.43 ntp.spec
--- openpkg-src/ntp/ntp.spec 14 Jul 2003 14:26:05 -0000 1.42
+++ openpkg-src/ntp/ntp.spec 17 Jul 2003 09:49:10 -0000 1.43
@@ -33,7 +33,7 @@
Group: Network
License: BSD-style
Version: 4.1.1c
-Release: 20030714
+Release: 20030717
# package options
%option with_fsl yes
@@ -48,8 +48,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030710
-PreReq: OpenPKG, openpkg >= 20030710
+BuildPreReq: OpenPKG, openpkg >= 20030716
+PreReq: OpenPKG, openpkg >= 20030716
%if "%{with_fsl}" == "yes"
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ntp/rc.ntp
============================================================================
$ cvs diff -u -r1.13 -r1.14 rc.ntp
--- openpkg-src/ntp/rc.ntp 10 Jul 2003 07:50:44 -0000 1.13
+++ openpkg-src/ntp/rc.ntp 17 Jul 2003 09:49:11 -0000 1.14
@@ -13,12 +13,21 @@
ntp_log_complevel="9"
%common
+ ntp_pidfile="@l_prefix@/var/ntp/ntpd.pid"
ntp_signal () {
- if [ -f "@l_prefix@/var/ntp/ntpd.pid" ]; then
- kill -$1 `cat @l_prefix@/var/ntp/ntpd.pid`
- fi
+ [ -f $ntp_pidfile ] && kill -$1 `cat $ntp_pidfile`
}
+%status -p 200 -u @l_susr@ -o
+ ntp_usable="unknown"
+ ntp_active="no"
+ opServiceEnabled ntp && \
+ opVarIsYes ntp_daemon && \
+ ntp_signal 0 && ntp_active="yes"
+ echo "ntp_enable=\"$ntp_enable\""
+ echo "ntp_usable=\"$ntp_usable\""
+ echo "ntp_active=\"$ntp_active\""
+
%start -p 200 -u @l_susr@
opServiceEnabled ntp || exit 0
@@ -40,6 +49,7 @@
opServiceEnabled ntp || exit 0
if opVarIsYes ntp_daemon; then
ntp_signal TERM
+ rm -f $ntp_pidfile 2>/dev/null || true
fi
%restart -u @l_susr@
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5606 -r1.5607 news.txt
--- openpkg-web/news.txt 17 Jul 2003 09:35:14 -0000 1.5606
+++ openpkg-web/news.txt 17 Jul 2003 09:49:09 -0000 1.5607
@@ -1,3 +1,4 @@
+17-Jul-2003: Upgraded package: P<ntp-4.1.1c-20030717>
17-Jul-2003: Upgraded package: P<openpkg-20030717-20030717>
17-Jul-2003: Upgraded package: P<uvscan-4.1.6.4277-20030717>
17-Jul-2003: Upgraded package: P<treecc-0.2.6-20030717>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
