Changeset 21110


Ignore:
Timestamp:
2010-04-23T15:43:57+02:00 (7 years ago)
Author:
jow
Message:

[backfire] merge r21109

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

Legend:

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

    r20936 r21110  
    1010PKG_NAME:=dnsmasq 
    1111PKG_VERSION:=2.52 
    12 PKG_RELEASE:=3 
     12PKG_RELEASE:=4 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
  • branches/backfire/package/dnsmasq/files/dnsmasq.init

    r20936 r21110  
    297297 
    298298        for name in $names; do 
    299                 append args "-A /$name/$ip" 
    300                 [ -n "$raddr" ] && \ 
    301                         append args "--ptr-record=$raddr,$name" 
     299                local fqdn="$name" 
     300 
     301                [ "${fqdn%.*}" == "$fqdn" ] && \ 
     302                        fqdn="$fqdn${DOMAIN:+.$DOMAIN}" 
     303 
     304                append args "-A /$fqdn/$ip" 
     305                 
     306                [ -n "$raddr" ] && { 
     307                        append args "--ptr-record=$raddr,$fqdn" 
     308                        raddr="" 
     309                } 
    302310        done 
    303311} 
Note: See TracChangeset for help on using the changeset viewer.