Changeset 28942


Ignore:
Timestamp:
2011-11-11T14:23:29+01:00 (6 years ago)
Author:
nico
Message:

package/base-files-network: fix udhcpc issues introduced in r28866 (closes: #10383)

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

Legend:

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

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

    r28866 r28942  
    371371 
    372372                        SERVICE_PID_FILE="$pidfile" \ 
    373                         service_stop udhcpc 
     373                        service_stop /sbin/udhcpc 
    374374 
    375375                        local ipaddr netmask hostname proto1 clientid vendorid broadcast reqopts 
     
    387387 
    388388                        # additional request options 
    389                         local opt dhcpopts 
     389                        local opt dhcpopts daemonize 
    390390                        for opt in $reqopts; do 
    391391                                append dhcpopts "-O $opt" 
     
    393393 
    394394                        # don't stay running in background if dhcp is not the main proto on the interface (e.g. when using pptp) 
    395                         [ "$proto1" != "$proto" ] && append dhcpopts "-n -q" || append dhcpopts "-O rootpath -R &" 
     395                        [ "$proto1" != "$proto" ] && { 
     396                                append dhcpopts "-n -q" 
     397                        } || { 
     398                                append dhcpopts "-O rootpath -R" 
     399                                daemonize=1 
     400                        } 
    396401                        [ "$broadcast" = 1 ] && broadcast="-O broadcast" || broadcast= 
    397402 
     403                        SERVICE_DAEMONIZE=$daemonize \ 
    398404                        SERVICE_PID_FILE="$pidfile" \ 
    399405                        service_start /sbin/udhcpc -t 0 -i "$iface" \ 
Note: See TracChangeset for help on using the changeset viewer.