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/files/dnsmasq.conf | |
| parent | cf5ef7c683fa845a6e6412b319e0a1040aa0f445 (diff) | |
| parent | cd83ced050a5d68c922a0de054ac022cd4ff26ac (diff) | |
resolve conflict
Diffstat (limited to 'package/dnsmasq/files/dnsmasq.conf')
| -rw-r--r-- | package/dnsmasq/files/dnsmasq.conf | 10 |
1 files changed, 4 insertions, 6 deletions
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): |