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: 14-Nov-2003 13:54:55
Branch: HEAD Handle: 2003111412545301
Modified files:
openpkg-src/tsmc dsm.sys rc.tsmc tsmc.spec
openpkg-web news.txt
Log:
Implement PR #202
Summary:
Revision Changes Path
1.6 +1 -1 openpkg-src/tsmc/dsm.sys
1.9 +57 -4 openpkg-src/tsmc/rc.tsmc
1.45 +17 -1 openpkg-src/tsmc/tsmc.spec
1.7401 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/tsmc/dsm.sys
============================================================================
$ cvs diff -u -r1.5 -r1.6 dsm.sys
--- openpkg-src/tsmc/dsm.sys 22 Nov 2002 16:03:50 -0000 1.5
+++ openpkg-src/tsmc/dsm.sys 14 Nov 2003 12:54:54 -0000 1.6
@@ -5,7 +5,7 @@
ServerName tsm.example.com
CommMethod TCPip
- TCPServerAddress 192.168.0.1
+ TCPServerAddress 127.0.0.1
TCPPort 1500
TCPNoDelay yes
PasswordAccess prompt
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tsmc/rc.tsmc
============================================================================
$ cvs diff -u -r1.8 -r1.9 rc.tsmc
--- openpkg-src/tsmc/rc.tsmc 22 Jul 2003 08:11:17 -0000 1.8
+++ openpkg-src/tsmc/rc.tsmc 14 Nov 2003 12:54:54 -0000 1.9
@@ -5,12 +5,37 @@
%config
tsmc_enable="$openpkg_rc_def"
+ tsmc_sched_file="@l_prefix@/var/tsmc/dsm.sched.log"
+ tsmc_sched_prolog="true"
+ tsmc_sched_epilog="true"
+ tsmc_sched_numfiles="10"
+ tsmc_sched_minsize="1M"
+ tsmc_sched_complevel="9"
+ tsmc_error_file="@l_prefix@/var/tsmc/dsm.error.log"
+ tsmc_error_prolog="true"
+ tsmc_error_epilog="true"
+ tsmc_error_numfiles="10"
+ tsmc_error_minsize="1M"
+ tsmc_error_complevel="9"
%common
tsmc_pidfile="@l_prefix@/var/tsmc/dsmc.sched.pid"
+ tsmc_signal () {
+ [ -f $tsmc_pidfile ] && kill -$1 `cat $tsmc_pidfile`
+ }
+
+%status -u @l_susr@ -o
+ tsmc_usable="unknown"
+ tsmc_active="no"
+ rcService tsmc enable yes && \
+ tsmc_signal 0 && tsmc_active="yes"
+ echo "tsmc_enable=\"$tsmc_enable\""
+ echo "tsmc_usable=\"$tsmc_usable\""
+ echo "tsmc_active=\"$tsmc_active\""
%start -u @l_susr@
rcService tsmc enable yes || exit 0
+ rcService tsmc active yes && exit 0
( PATH=/bin:/sbin:/usr/bin:/usr/sbin:$PATH
nohup @l_prefix@/bin/dsmc sched </dev/null >/dev/null 2>&1 &
echo "$!" >$tsmc_pidfile
@@ -18,9 +43,37 @@
%stop -u @l_susr@
rcService tsmc enable yes || exit 0
- if [ -f $tsmc_pidfile ]; then
- kill -TERM `cat $tsmc_pidfile` >/dev/null 2>&1 || true
- sleep 2
- kill -KILL `cat $tsmc_pidfile` >/dev/null 2>&1 || true
+ rcService tsmc active no && exit 0
+ tsmc_signal TERM
+ sleep 2
+ tsmc_signal KILL
+ rm -f $tsmc_pidfile
+
+%restart -u @l_susr@
+ rcService tsmc enable yes || exit 0
+ rcService tsmc active no && exit 0
+ rc tsmc stop start
+
+%daily -u @l_susr@
+ rcService tsmc enable yes || exit 0
+
+ # rotate logfiles
+ rcTmp -i
+ hintfile=`rcTmp -f -n hint`
+ shtool rotate -f \
+ -n ${tsmc_sched_numfiles} -s ${tsmc_sched_minsize} -d \
+ -z ${tsmc_sched_complevel} -o @l_susr@ -g @l_sgrp@ -m 644 \
+ -P "${tsmc_sched_prolog}" \
+ -E "${tsmc_sched_epilog} && echo 1 >$hintfile" \
+ ${tsmc_sched_file}
+ shtool rotate -f \
+ -n ${tsmc_error_numfiles} -s ${tsmc_error_minsize} -d \
+ -z ${tsmc_error_complevel} -o @l_susr@ -g @l_sgrp@ -m 644 \
+ -P "${tsmc_error_prolog}" \
+ -E "${tsmc_error_epilog} && echo 1 >$hintfile" \
+ ${tsmc_error_file}
+ if [ -s $hintfile ]; then
+ rc tsmc restart
fi
+ rcTmp -k
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tsmc/tsmc.spec
============================================================================
$ cvs diff -u -r1.44 -r1.45 tsmc.spec
--- openpkg-src/tsmc/tsmc.spec 18 Sep 2003 16:45:51 -0000 1.44
+++ openpkg-src/tsmc/tsmc.spec 14 Nov 2003 12:54:54 -0000 1.45
@@ -33,7 +33,7 @@
Group: System
License: Commercial
Version: 5.1.6.2
-Release: 20030918
+Release: 20031114
# list of sources
Source0:
ftp://service.boulder.ibm.com/storage/tivoli-storage-management/patches/client/v5r1/Linux/Linux86/v516/TIVsm-BA.i386.rpm
@@ -148,6 +148,7 @@
rm -rf $RPM_BUILD_ROOT
%post
+ # after initial install, check requirements and make recommendations
if [ $1 -eq 1 ]; then
case "%{l_platform -t}" in
*-freebsd*)
@@ -194,4 +195,19 @@
;;
esac
fi
+
+ # after upgrade, restart service
+ if [ $1 -eq 2 ]; then
+ eval `%{l_rc} tsmc status 2>/dev/null`
+ [ ".$tsmc_active" = .yes ] && %{l_rc} tsmc restart
+ fi
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ if [ $1 -eq 0 ]; then
+ %{l_rc} tsmc stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/tsmc/*.log* >/dev/null 2>&1 || true
+ fi
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7400 -r1.7401 news.txt
--- openpkg-web/news.txt 14 Nov 2003 08:48:54 -0000 1.7400
+++ openpkg-web/news.txt 14 Nov 2003 12:54:53 -0000 1.7401
@@ -1,3 +1,4 @@
+14-Nov-2003: Upgraded package: P<tsmc-5.1.6.2-20031114>
14-Nov-2003: Upgraded package: P<orbit2-2.9.1-20031114>
14-Nov-2003: Upgraded package: P<ddd-3.3.8-20031114>
14-Nov-2003: Upgraded package: P<mplayer-1.0pre2-20031114>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
