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:   09-Nov-2004 13:30:30
  Branch: OPENPKG_2_2_SOLID                Handle: 2004110912302900

  Modified files:           (Branch: OPENPKG_2_2_SOLID)
    openpkg-src/dhcpd       dhcpd.spec rc.dhcpd

  Log:
    MFC: fix rc %status and %start commands

  Summary:
    Revision    Changes     Path
    1.62.2.2    +1  -1      openpkg-src/dhcpd/dhcpd.spec
    1.17.2.1    +3  -3      openpkg-src/dhcpd/rc.dhcpd
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/dhcpd/dhcpd.spec
  ============================================================================
  $ cvs diff -u -r1.62.2.1 -r1.62.2.2 dhcpd.spec
  --- openpkg-src/dhcpd/dhcpd.spec      11 Oct 2004 18:54:38 -0000      1.62.2.1
  +++ openpkg-src/dhcpd/dhcpd.spec      9 Nov 2004 12:30:29 -0000       1.62.2.2
  @@ -34,7 +34,7 @@
   Group:        DNS
   License:      ISC/BSD
   Version:      3.0.1
  -Release:      2.2.0
  +Release:      2.2.1
   
   #   package options
   %option       with_fsl  yes
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/dhcpd/rc.dhcpd
  ============================================================================
  $ cvs diff -u -r1.17 -r1.17.2.1 rc.dhcpd
  --- openpkg-src/dhcpd/rc.dhcpd        30 Aug 2004 13:03:42 -0000      1.17
  +++ openpkg-src/dhcpd/rc.dhcpd        9 Nov 2004 12:30:29 -0000       1.17.2.1
  @@ -26,8 +26,8 @@
           if [ $? -ne 0 -a ".$dhcpd_port" != . ]; then
               cmd="$cmd -p $dhcpd_port"
           fi
  -        if [ $# -ge 0 ]; then
  -            flags="$flags $@"
  +        if [ $# -gt 0 ]; then
  +            cmd="$cmd $@"
           fi
           cmd="$cmd >/dev/null 2>&1"
           eval $cmd
  @@ -48,7 +48,7 @@
       rcService dhcpd enable yes || exit 0
       rcService dhcpd usable no  && exit 0
       rcService dhcpd active yes && exit 0
  -    dhcpd_start
  +    dhcpd_start $dhcpd_if
   
   %stop -u @l_susr@
       rcService dhcpd enable yes || exit 0
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to