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:   21-Jul-2003 18:14:45
  Branch: HEAD                             Handle: 2003072117144400

  Modified files:
    openpkg-src/djbdns      rc.djbdns

  Log:
    %status and pidfile handling

  Summary:
    Revision    Changes     Path
    1.11        +42 -19     openpkg-src/djbdns/rc.djbdns
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/djbdns/rc.djbdns
  ============================================================================
  $ cvs diff -u -r1.10 -r1.11 rc.djbdns
  --- openpkg-src/djbdns/rc.djbdns      19 Jul 2003 17:05:52 -0000      1.10
  +++ openpkg-src/djbdns/rc.djbdns      21 Jul 2003 16:14:44 -0000      1.11
  @@ -10,28 +10,51 @@
       djbdns_var="@l_prefix@/var/djbdns"
       djbdns_progs="dnscache tinydns"
   
  +%common
  +    djbdns_signal () {
  +        local s
  +        local rc=0
  +        for s in $djbdns_progs ; do
  +            if [ -f $djbdns_var/$s.pid ]; then
  +                kill -$1 `cat $djbdns_var/$s.pid` || rc=1
  +            fi
  +        done
  +        [ $rc -eq 0 ]
  +    }
  +    djbdns_start () {
  +        local s
  +        for s in $djbdns_progs ; do
  +            if [ -d $djbdns_var/$s ]; then
  +                $djbdns_runsvc \
  +                    $djbdns_bin/$s \
  +                    $djbdns_var/$s \
  +                    >$djbdns_var/$s.pid
  +            fi
  +        done
  +    }
  +    djbdns_stop () {
  +        local s
  +        djbdns_signal TERM
  +        for s in $djbdns_progs ; do
  +            rm -f $djbdns_var/$s.pid 2>/dev/null || true
  +        done
  +    }
  +
  +%status -p 200 -u @l_susr@ -o
  +    ntp_usable="unknown"
  +    ntp_active="no"
  +    rcService ntp enable yes && \
  +    rcVarIsYes ntp_daemon && \
  +        ntp_signal 0 && ntp_active="yes"
  +    echo "ntp_enable=\"$ntp_enable\""
  +    echo "ntp_usable=\"$ntp_usable\""
  +    echo "ntp_active=\"$ntp_active\""
  +
   %start -p 200 -u @l_susr@
       rcService djbdns enable yes || exit 0
  -    for s in $djbdns_progs ; do
  -        if [ -d $djbdns_var/$s ]; then
  -            $djbdns_runsvc \
  -                $djbdns_bin/$s \
  -                $djbdns_var/$s \
  -                >$djbdns_var/$s.pid
  -        fi
  -    done
  +    djbdns_start
   
   %stop -p 200 -u @l_susr@
       rcService djbdns enable yes || exit 0
  -    for s in $djbdns_progs ; do
  -        if [ -f $djbdns_var/$s.pid ]; then
  -            pid=`cat $djbdns_var/$s.pid`
  -            if [ x"$pid" != x ]; then
  -                kill -TERM "$pid"
  -                rm $djbdns_var/$s.pid
  -            else
  -                echo "ERROR: Invalid pid-file '$djbdns_var/$s.pid'"
  -            fi
  -        fi
  -    done
  +    djbdns_stop
   
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to