Changeset 28866


Ignore:
Timestamp:
2011-11-08T23:47:54+01:00 (4 years ago)
Author:
nico
Message:

package/base-files-network: use new service wrappers

Location:
trunk/package/base-files-network
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/base-files-network/Makefile

    r28499 r28866  
    1010 
    1111PKG_NAME:=base-files-network 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313 
    1414PKG_BUILD_DEPENDS:=opkg/host 
  • trunk/package/base-files-network/files/lib/network/config.sh

    r28745 r28866  
    11#!/bin/sh 
    2 # Copyright (C) 2006 OpenWrt.org 
     2# Copyright (C) 2006-2011 OpenWrt.org 
    33 
    44# DEBUG="echo" 
     
    369369                        # kill running udhcpc instance 
    370370                        local pidfile="/var/run/dhcp-${iface}.pid" 
    371                         service_kill udhcpc "$pidfile" 
     371 
     372                        SERVICE_PID_FILE="$pidfile" \ 
     373                        service_stop udhcpc 
    372374 
    373375                        local ipaddr netmask hostname proto1 clientid vendorid broadcast reqopts 
     
    394396                        [ "$broadcast" = 1 ] && broadcast="-O broadcast" || broadcast= 
    395397 
    396                         $DEBUG eval udhcpc -t 0 -i "$iface" \ 
     398                        SERVICE_PID_FILE="$pidfile" \ 
     399                        service_start /sbin/udhcpc -t 0 -i "$iface" \ 
    397400                                ${ipaddr:+-r $ipaddr} \ 
    398401                                ${hostname:+-H $hostname} \ 
     
    427430        remove_dns "$config" 
    428431 
    429         local pidfile="/var/run/dhcp-${ifname}.pid" 
    430         service_kill udhcpc "$pidfile" 
     432        SERVICE_PID_FILE="/var/run/dhcp-${ifname}.pid" \ 
     433        service_stop /sbin/udhcpc 
    431434 
    432435        uci -P /var/state revert "network.$config" 
Note: See TracChangeset for help on using the changeset viewer.