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                      Date:   22-Jul-2003 17:05:27
  Branch: HEAD                             Handle: 2003072216052600

  Modified files:
    openpkg-src/snmp        rc.snmp

  Log:
    %status and pidfile handling

  Summary:
    Revision    Changes     Path
    1.10        +18 -9      openpkg-src/snmp/rc.snmp
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/snmp/rc.snmp
  ============================================================================
  $ cvs diff -u -r1.9 -r1.10 rc.snmp
  --- openpkg-src/snmp/rc.snmp  22 Jul 2003 08:11:11 -0000      1.9
  +++ openpkg-src/snmp/rc.snmp  22 Jul 2003 15:05:26 -0000      1.10
  @@ -12,16 +12,27 @@
       snmp_log_complevel="9"
   
   %common
  +    snmp_pidfile="@l_prefix@/var/snmp/snmpd.pid"
  +    snmp_config="@l_prefix@/etc/snmp/snmpd.conf"
       snmp_signal () {
  -        if [ -f "@l_prefix@/var/snmp/snmpd.pid" ]; then
  -            kill -$1 `cat @l_prefix@/var/snmp/snmpd.pid`
  -        fi
  +        [ -f $snmp_pidfile ] && kill -$1 `cat $snmp_pidfile`
       }
   
  +%status -u @l_susr@ -o
  +    snmp_usable="no"
  +    snmp_active="no"
  +    rcService snmp enable yes && \
  +        [ -f $snmp_config ] && snmp_usable="yes"
  +    rcService snmp enable yes && \
  +        snmp_signal 0 && snmp_active="yes"
  +    echo "snmp_enable=\"$snmp_enable\""
  +    echo "snmp_usable=\"$snmp_usable\""
  +    echo "snmp_active=\"$snmp_active\""
  +
   %start -u @l_susr@
       rcService snmp enable yes || exit 0
  -    if [ -f @l_prefix@/etc/snmp/snmpd.conf ]; then
  -        @l_prefix@/sbin/snmpd -s -P @l_prefix@/var/snmp/snmpd.pid
  +    if [ -f $snmp_config ]; then
  +        @l_prefix@/sbin/snmpd -s -P $snmp_pidfile
       fi
   
   %stop -u @l_susr@
  @@ -30,11 +41,9 @@
   
   %restart -u @l_susr@
       rcService snmp enable yes || exit 0
  -    snmp_signal TERM
  +    rc snmp stop
       sleep 2
  -    if [ -f @l_prefix@/etc/snmp/snmpd.conf ]; then
  -        @l_prefix@/sbin/snmpd -s -P @l_prefix@/var/snmp/snmpd.pid
  -    fi
  +    rc snmp start
   
   %daily -u @l_susr@
       rcService snmp enable yes || exit 0
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to