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 12:16:30
Branch: HEAD Handle: 2003071711162802
Modified files:
openpkg-src/rsync rc.rsync rsync.spec
openpkg-web news.txt
Log:
%status and pidfile handling
Summary:
Revision Changes Path
1.14 +17 -7 openpkg-src/rsync/rc.rsync
1.46 +3 -3 openpkg-src/rsync/rsync.spec
1.5609 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rsync/rc.rsync
============================================================================
$ cvs diff -u -r1.13 -r1.14 rc.rsync
--- openpkg-src/rsync/rc.rsync 10 Jul 2003 07:51:01 -0000 1.13
+++ openpkg-src/rsync/rc.rsync 17 Jul 2003 10:16:30 -0000 1.14
@@ -15,6 +15,18 @@
rsync_cfgfile="@l_prefix@/etc/rsync/rsync.conf"
rsync_logfile="@l_prefix@/var/rsync/rsync.log"
rsync_pidfile="@l_prefix@/var/rsync/rsync.pid"
+ rsync_signal () {
+ [ -f $rsync_pidfile ] && kill -$1 `cat $rsync_pidfile`
+ }
+
+%status -p 200 -u @l_susr@ -o
+ rsync_usable="unknown"
+ rsync_active="no"
+ opServiceEnabled rsync && \
+ rsync_signal 0 && rsync_active="yes"
+ echo "rsync_enable=\"$rsync_enable\""
+ echo "rsync_usable=\"$rsync_usable\""
+ echo "rsync_active=\"$rsync_active\""
%start -p 200 -u @l_susr@
opServiceEnabled rsync || exit 0
@@ -23,16 +35,14 @@
%stop -p 200 -u @l_susr@
opServiceEnabled rsync || exit 0
- if [ -f $rsync_pidfile ]; then
- kill -TERM `cat $rsync_pidfile`
- fi
+ rsync_signal TERM
+ # rsync removes the pidfile itself
+ # rm -f $rsync_pidfile 2>/dev/null || true
%restart -u @l_susr@
opServiceEnabled rsync || exit 0
- if [ -f $rsync_pidfile ]; then
- kill -TERM `cat $rsync_pidfile`
- sleep 2
- fi
+ rsync_signal TERM
+ sleep 2
nice -n $rsync_nicelevel @l_prefix@/bin/rsync $rsync_flags \
--daemon --config=$rsync_cfgfile
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rsync/rsync.spec
============================================================================
$ cvs diff -u -r1.45 -r1.46 rsync.spec
--- openpkg-src/rsync/rsync.spec 10 Jul 2003 07:51:01 -0000 1.45
+++ openpkg-src/rsync/rsync.spec 17 Jul 2003 10:16:30 -0000 1.46
@@ -33,7 +33,7 @@
Group: Filesystem
License: GPL
Version: 2.5.6
-Release: 20030710
+Release: 20030717
# list of sources
Source0: http://rsync.samba.org/ftp/rsync/rsync-%{version}.tar.gz
@@ -44,8 +44,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
AutoReq: no
AutoReqProv: no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5608 -r1.5609 news.txt
--- openpkg-web/news.txt 17 Jul 2003 10:14:03 -0000 1.5608
+++ openpkg-web/news.txt 17 Jul 2003 10:16:28 -0000 1.5609
@@ -1,3 +1,4 @@
+17-Jul-2003: Upgraded package: P<rsync-2.5.6-20030717>
17-Jul-2003: Upgraded package: P<openssh-3.6.1p2-20030717>
17-Jul-2003: Upgraded package: P<ntp-4.1.1c-20030717>
17-Jul-2003: Upgraded package: P<openpkg-20030717-20030717>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
