diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-28 20:56:44 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-28 20:56:44 +0100 |
| commit | 2c8917958da115704507aab835c41c1a4a63664d (patch) | |
| tree | e79c26b6347e2ae8444bcdbce1236cc48f63107e /package/dnsmasq | |
| parent | cf5ef7c683fa845a6e6412b319e0a1040aa0f445 (diff) | |
| parent | cd83ced050a5d68c922a0de054ac022cd4ff26ac (diff) | |
resolve conflict
Diffstat (limited to 'package/dnsmasq')
| -rw-r--r-- | package/dnsmasq/Makefile | 2 | ||||
| -rw-r--r-- | package/dnsmasq/files/dnsmasq.conf | 10 | ||||
| -rw-r--r-- | package/dnsmasq/files/dnsmasq.init | 2 | ||||
| -rw-r--r-- | package/dnsmasq/files/dnsmasq.postinst | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 6bce7db1e..3cca7cc35 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dnsmasq PKG_VERSION:= 2.55 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= b093d7c6bc7f97ae6fd35d048529232a PKG_DESCR:= A lightweight DNS and DHCP server PKG_SECTION:= dns diff --git a/package/dnsmasq/files/dnsmasq.conf b/package/dnsmasq/files/dnsmasq.conf index 086a0b7f7..9da4b0c85 100644 --- a/package/dnsmasq/files/dnsmasq.conf +++ b/package/dnsmasq/files/dnsmasq.conf @@ -12,21 +12,19 @@ expand-hosts # add more dhcp-range options for every subnet dhcp-range=192.168.1.129,192.168.1.254,255.255.255.0,72h interface=lo -interface=eth0.0 -#interface=eth1 -interface=br0 +interface=eth0 # Enable dnsmasq's built-in TFTP server -#enable-tftp +enable-tftp # Set the root directory for files available via TFTP. -#tftp-root=/tftpboot +tftp-root=/tftpboot dhcp-authoritative dhcp-leasefile=/tmp/dhcp.leases # use /etc/ethers for static hosts # <hwaddr> <ipaddr> -#read-ethers +read-ethers # other useful options (0.0.0.0 means server itself) # default route(s): diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init index 7f4f75325..07c76f862 100644 --- a/package/dnsmasq/files/dnsmasq.init +++ b/package/dnsmasq/files/dnsmasq.init @@ -6,7 +6,7 @@ case $1 in autostop) ;; autostart) - [[ $dns_dhcp = NO ]] && exit 0 + [[ $dnsmasq = NO ]] && exit 0 exec sh $0 start ;; start) diff --git a/package/dnsmasq/files/dnsmasq.postinst b/package/dnsmasq/files/dnsmasq.postinst index f2ff69e58..86cf960e6 100644 --- a/package/dnsmasq/files/dnsmasq.postinst +++ b/package/dnsmasq/files/dnsmasq.postinst @@ -4,4 +4,4 @@ gid=$(get_next_gid) add_user dnsmasq $(get_next_uid) $gid /tmp add_group dnsmasq $gid -add_rcconf dnsmasq dns_dhcp NO +add_rcconf dnsmasq dnsmasq NO |