Changeset 24052


Ignore:
Timestamp:
2010-11-21T14:54:09+01:00 (6 years ago)
Author:
jow
Message:

[backfire] merge r24051

Location:
branches/backfire/package/dnsmasq
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/backfire/package/dnsmasq/Makefile

    r23271 r24052  
    1010PKG_NAME:=dnsmasq 
    1111PKG_VERSION:=2.55 
    12 PKG_RELEASE:=5 
     12PKG_RELEASE:=6 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
  • branches/backfire/package/dnsmasq/files/dnsmasq.init

    r23273 r24052  
    272272        } 
    273273 
    274         append_bool "$cfg" ignore "-2 '$ifname'" && return 0 
     274        append_bool "$cfg" ignore "-2 $ifname" && return 0 
    275275 
    276276        config_get proto "$net" proto 
     
    284284        config_get_bool force "$cfg" force 0 
    285285        [ $force -gt 0 ] || { 
    286                 udhcpc -n -q -s /bin/true -t 1 -i $ifname >&- && return 0 
     286                udhcpc -n -q -s /bin/true -t 1 -i $ifname >&- && { 
     287                        logger -t dnsmasq \ 
     288                                "found already running DHCP-server on interface '$ifname'" \ 
     289                                "refusing to start, use 'option force 1' to override" 
     290                        return 0 
     291                } 
    287292        } 
    288293 
Note: See TracChangeset for help on using the changeset viewer.