Changeset 28841


Ignore:
Timestamp:
2011-11-07T23:59:06+01:00 (6 years ago)
Author:
nico
Message:

package/uhttpd: use new service wrapper

Location:
trunk/package/uhttpd
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/uhttpd/Makefile

    r28792 r28841  
    99 
    1010PKG_NAME:=uhttpd 
    11 PKG_RELEASE:=28 
     11PKG_RELEASE:=29 
    1212 
    1313PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) 
  • trunk/package/uhttpd/files/uhttpd.init

    r28776 r28841  
    33 
    44START=50 
     5 
     6SERVICE_DAEMONIZE=1 
     7SERVICE_WRITE_PID=1 
     8 
    59UHTTPD_BIN="/usr/sbin/uhttpd" 
    610PX5G_BIN="/usr/sbin/px5g" 
    7  
    811 
    912append_arg() { 
     
    104107        } 
    105108 
    106         start-stop-daemon -S -x $UHTTPD_BIN \ 
    107                 -p /var/run/uhttpd_${cfg}.pid \ 
    108                 -m -b -- -f $UHTTPD_ARGS 
     109        SERVICE_PID_FILE=/var/run/uhttpd_${cfg}.pid 
     110        service_start $UHTTPD_BIN -f $UHTTPD_ARGS 
    109111} 
    110112 
     
    113115        local cfg="$1" 
    114116 
    115         [ -f /var/run/uhttpd_${cfg}.pid ] && { 
    116                 start-stop-daemon -K -q -n ${UHTTPD_BIN##*/} \ 
    117                         -p /var/run/uhttpd_${cfg}.pid -s TERM 
    118  
    119                 rm -f /var/run/uhttpd_${cfg}.pid 
    120         } 
     117        SERVICE_PID_FILE=/var/run/uhttpd_${cfg}.pid 
     118        service_stop $UHTTPD_BIN 
    121119} 
    122120 
Note: See TracChangeset for help on using the changeset viewer.