OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 01-Oct-2003 16:32:19
Branch: HEAD Handle: 2003100115321702
Modified files:
openpkg-src/vrrpd rc.vrrpd vrrpd.spec
openpkg-web news.txt
Log:
Implement features in ticket #202
Summary:
Revision Changes Path
1.15 +28 -3 openpkg-src/vrrpd/rc.vrrpd
1.24 +15 -1 openpkg-src/vrrpd/vrrpd.spec
1.6808 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/vrrpd/rc.vrrpd
============================================================================
$ cvs diff -u -r1.14 -r1.15 rc.vrrpd
--- openpkg-src/vrrpd/rc.vrrpd 22 Jul 2003 08:11:18 -0000 1.14
+++ openpkg-src/vrrpd/rc.vrrpd 1 Oct 2003 14:32:19 -0000 1.15
@@ -11,20 +11,45 @@
vrrpd_log_minsize="1M"
vrrpd_log_complevel="9"
+%common
+ vrrpd_signal () {
+ killall -$1 vrrpd >/dev/null 2>&1
+ }
+
+%status -u @l_susr@ -o
+ vrrpd_usable="unknown"
+ vrrpd_active="no"
+ rcService vrrpd enable yes && \
+ vrrpd_signal 0 && vrrpd_active="yes"
+ echo "vrrpd_enable=\"$vrrpd_enable\""
+ echo "vrrpd_usable=\"$vrrpd_usable\""
+ echo "vrrpd_active=\"$vrrpd_active\""
+
%start -u @l_susr@
rcService vrrpd enable yes || exit 0
+ rcService vrrpd active yes && exit 0
@l_prefix@/sbin/vrrpd >/dev/null 2>&1
%stop -u @l_susr@
rcService vrrpd enable yes || exit 0
- /usr/bin/killall vrrpd >/dev/null 2>&1
+ rcService vrrpd active no && exit 0
+ vrrpd_signal TERM
+
+%restart -u @l_susr@
+ rcService vrrpd enable yes || exit 0
+ rcService vrrpd active no && exit 0
+ rc vrrpd stop
+ sleep 2
+ rc vrrpd start
%daily -u @l_susr@
rcService vrrpd enable yes || exit 0
+
+ # rotate logfiles
shtool rotate -f \
-n ${vrrpd_log_numfiles} -s ${vrrpd_log_minsize} -d \
- -z ${vrrpd_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+ -z ${vrrpd_log_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
-P "${vrrpd_log_prolog}" \
- -E "${vrrpd_log_epilog}" \
+ -E "${vrrpd_log_epilog} && rc vrrpd restart" \
@l_prefix@/var/vrrpd/vrrpd.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/vrrpd/vrrpd.spec
============================================================================
$ cvs diff -u -r1.23 -r1.24 vrrpd.spec
--- openpkg-src/vrrpd/vrrpd.spec 18 Sep 2003 16:45:53 -0000 1.23
+++ openpkg-src/vrrpd/vrrpd.spec 1 Oct 2003 14:32:19 -0000 1.24
@@ -35,7 +35,7 @@
Group: Network
License: BSD
Version: 0.8.7
-Release: 20030918
+Release: 20031001
# package options
%option with_fsl yes
@@ -117,4 +117,18 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} vrrpd status 2>/dev/null`
+ [ ".$vrrpd_active" = .yes ] && %{l_rc} vrrpd restart
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} vrrpd stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/vrrpd/vrrpd.log* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6807 -r1.6808 news.txt
--- openpkg-web/news.txt 1 Oct 2003 13:33:19 -0000 1.6807
+++ openpkg-web/news.txt 1 Oct 2003 14:32:17 -0000 1.6808
@@ -1,3 +1,4 @@
+01-Oct-2003: Upgraded package: P<vrrpd-0.8.7-20031001>
01-Oct-2003: Upgraded package: P<pb4sd-1.2-1.2.1>
01-Oct-2003: Upgraded package: P<pb4sd-1.2-1.3.1>
01-Oct-2003: Upgraded package: P<pb4sd-1.2-20031001>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
