projects
/
openwrt-10.03
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[backfire] dnsmasq: backport r29375
[openwrt-10.03/.git]
/
package
/
dnsmasq
/
files
/
dnsmasq.init
diff --git
a/package/dnsmasq/files/dnsmasq.init
b/package/dnsmasq/files/dnsmasq.init
index 0c2229d88b2ee40e3d69312f43dab908054bdf8a..c79b67ea7c704a3f20a7fc2cd047917cad78ce14 100644
(file)
--- a/
package/dnsmasq/files/dnsmasq.init
+++ b/
package/dnsmasq/files/dnsmasq.init
@@
-322,10
+322,10
@@
dhcp_domain_add() {
local cfg="$1"
local ip name names
local cfg="$1"
local ip name names
- config_get names "$cfg" name
+ config_get names "$cfg" name
"$2"
[ -n "$names" ] || return 0
[ -n "$names" ] || return 0
- config_get ip "$cfg" ip
+ config_get ip "$cfg" ip
"$3"
[ -n "$ip" ] || return 0
local oIFS="$IFS"; IFS="."; set -- $ip; IFS="$oIFS"
[ -n "$ip" ] || return 0
local oIFS="$IFS"; IFS="."; set -- $ip; IFS="$oIFS"
@@
-349,6
+349,10
@@
dhcp_domain_add() {
start() {
include /lib/network
scan_interfaces
start() {
include /lib/network
scan_interfaces
+
+ local lanaddr
+ config_get lanaddr "lan" ipaddr
+
config_load dhcp
args=""
config_load dhcp
args=""
@@
-364,6
+368,12
@@
start() {
config_foreach dhcp_domain_add domain
config_foreach dhcp_add dhcp
config_foreach dhcp_domain_add domain
config_foreach dhcp_add dhcp
+ # add own hostname
+ [ -z "$lanaddr" ] || {
+ local hostname="$(uci_get system.@system[0].hostname)"
+ dhcp_domain_add "" "${hostname:-OpenWrt}" "$lanaddr"
+ }
+
/usr/sbin/dnsmasq $args && {
rm -f /tmp/resolv.conf
[ -n "$DOMAIN" ] && echo "search $DOMAIN" >> /tmp/resolv.conf
/usr/sbin/dnsmasq $args && {
rm -f /tmp/resolv.conf
[ -n "$DOMAIN" ] && echo "search $DOMAIN" >> /tmp/resolv.conf