Changeset 29520 for branches/backfire


Ignore:
Timestamp:
2011-12-13T16:46:21+01:00 (5 years ago)
Author:
jow
Message:

[backfire] dnsmasq: backport r29375

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

Legend:

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

    r24052 r29520  
    11#  
    2 # Copyright (C) 2006-2010 OpenWrt.org 
     2# Copyright (C) 2006-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010PKG_NAME:=dnsmasq 
    1111PKG_VERSION:=2.55 
    12 PKG_RELEASE:=6 
     12PKG_RELEASE:=6.1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
  • branches/backfire/package/dnsmasq/files/dnsmasq.init

    r24052 r29520  
    323323        local ip name names 
    324324 
    325         config_get names "$cfg" name 
     325        config_get names "$cfg" name "$2" 
    326326        [ -n "$names" ] || return 0 
    327327 
    328         config_get ip "$cfg" ip 
     328        config_get ip "$cfg" ip "$3" 
    329329        [ -n "$ip" ] || return 0 
    330330 
     
    350350        include /lib/network 
    351351        scan_interfaces 
     352 
     353        local lanaddr 
     354        config_get lanaddr "lan" ipaddr 
     355 
    352356        config_load dhcp 
    353357 
     
    365369        config_foreach dhcp_add dhcp 
    366370 
     371        # add own hostname 
     372        [ -z "$lanaddr" ] || { 
     373                local hostname="$(uci_get system.@system[0].hostname)" 
     374                dhcp_domain_add "" "${hostname:-OpenWrt}" "$lanaddr" 
     375        } 
     376 
    367377        /usr/sbin/dnsmasq $args && { 
    368378                rm -f /tmp/resolv.conf 
Note: See TracChangeset for help on using the changeset viewer.