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 Date: 16-Oct-2004 20:04:52
Branch: OPENPKG_2_2_SOLID Handle: 2004101619045200
Modified files: (Branch: OPENPKG_2_2_SOLID)
openpkg-src/cvs rc.cvs
Log:
MFC: control pserverd with cvs_pserverd* variables and do not start it
by default
Summary:
Revision Changes Path
1.20.2.1 +20 -15 openpkg-src/cvs/rc.cvs
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cvs/rc.cvs
============================================================================
$ cvs diff -u -r1.20 -r1.20.2.1 rc.cvs
--- openpkg-src/cvs/rc.cvs 20 Sep 2004 14:33:21 -0000 1.20
+++ openpkg-src/cvs/rc.cvs 16 Oct 2004 18:04:52 -0000 1.20.2.1
@@ -5,9 +5,10 @@
%config
cvs_enable="$openpkg_rc_def"
- cvs_gflags=""
- cvs_lflags=""
- cvs_listen="127.0.0.1:2401"
+ cvs_daemon="no"
+ cvs_daemon_gflags=""
+ cvs_daemon_lflags=""
+ cvs_daemon_listen="127.0.0.1:2401"
cvs_log_prolog="true"
cvs_log_epilog="true"
cvs_log_numfiles="10"
@@ -15,16 +16,16 @@
cvs_log_complevel="9"
%common
- cvs_pserverd_pidfile="@l_prefix@/var/cvs/pserverd.pid"
- cvs_pserverd_signal () {
- [ -f $cvs_pserverd_pidfile ] && kill -$1 `cat $cvs_pserverd_pidfile`
+ cvs_daemon_pidfile="@l_prefix@/var/cvs/cvs.pid"
+ cvs_daemon_signal () {
+ [ -f $cvs_daemon_pidfile ] && kill -$1 `cat $cvs_daemon_pidfile`
}
%status -u @l_susr@ -o
cvs_usable="unknown"
cvs_active="no"
- rcService cvs enable yes && \
- cvs_pserverd_signal 0 && cvs_active="yes"
+ rcService cvs enable yes && rcVarIsYes cvs_daemon && \
+ cvs_daemon_signal 0 && cvs_active="yes"
echo "cvs_enable=\"$cvs_enable\""
echo "cvs_usable=\"$cvs_usable\""
echo "cvs_active=\"$cvs_active\""
@@ -32,17 +33,21 @@
%start -u @l_susr@
rcService cvs enable yes || exit 0
rcService cvs active yes && exit 0
- @l_prefix@/bin/cvs --version | grep RSE >/dev/null || exit 0
- @l_prefix@/bin/cvs -f $cvs_gflags \
- pserverd -d -p $cvs_pserverd_pidfile \
- -l $cvs_listen $cvs_lflags
+ if rcVarIsYes cvs_daemon; then
+ @l_prefix@/bin/cvs --version | grep RSE >/dev/null || exit 0
+ @l_prefix@/bin/cvs -f $cvs_daemon_gflags \
+ pserverd -d -p $cvs_daemon_pidfile \
+ -l $cvs_daemon_listen $cvs_daemon_lflags
+ fi
%stop -u @l_susr@
rcService cvs enable yes || exit 0
rcService cvs active no && exit 0
- @l_prefix@/bin/cvs --version | grep RSE >/dev/null || exit 0
- cvs_pserverd_signal TERM
- rm -f $cvs_pserverd_pidfile 2>/dev/null || true
+ if rcVarIsYes cvs_daemon; then
+ @l_prefix@/bin/cvs --version | grep RSE >/dev/null || exit 0
+ cvs_daemon_signal TERM
+ rm -f $cvs_daemon_pidfile 2>/dev/null || true
+ fi
%restart -u @l_susr@
rcService cvs enable yes || exit 0
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
