X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/15fba44a5bc0e769efd4749dd31438e53b0ca765..f1f885a356aaf04e494adbaa3b5457e434f58640:/package/dnsmasq/files/dnsmasq.init

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index cd5a78ae8..b0c2cd226 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -2,6 +2,9 @@
 # Copyright (C) 2007 OpenWrt.org
 
 START=60
+
+SERVICE_USE_PID=1
+
 DNS_SERVERS=""
 DOMAIN=""
 
@@ -206,20 +209,19 @@ dhcp_vendorclass_add() {
 dhcp_host_add() {
 	local cfg="$1"
 
-	config_get name "$cfg" name
-
 	config_get networkid "$cfg" networkid
 	[ -n "$networkid" ] && dhcp_option_add "$cfg" "$networkid"
 
+	config_get name "$cfg" name
 	config_get ip "$cfg" ip
-	[ -n "$ip" ] || return 0
+	[ -n "$ip" ] || [ -n "$name" ] || return 0
 
 	macs=""
 	config_get mac "$cfg" mac
 	for m in $mac; do append macs "$m" ","; done
 	[ -n "$macs" ] || return 0
 
-	append args "--dhcp-host=$macs,${networkid:+net:$networkid,}$ip${name:+,$name}"
+	append args "--dhcp-host=$macs${networkid:+,net:$networkid}${ip:+,$ip}${name:+,$name}"
 }
 
 dhcp_mac_add() {
@@ -324,10 +326,10 @@ dhcp_domain_add() {
 	local cfg="$1"
 	local ip name names
 
-	config_get names "$cfg" name
+	config_get names "$cfg" name "$2"
 	[ -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"
@@ -340,7 +342,7 @@ dhcp_domain_add() {
 			fqdn="$fqdn${DOMAIN:+.$DOMAIN}"
 
 		append args "-A /$fqdn/$ip"
-		
+
 		[ -n "$raddr" ] && {
 			append args "--ptr-record=$raddr,$fqdn"
 			raddr=""
@@ -365,9 +367,26 @@ dhcp_srv_add() {
 	append args "-W $service"
 }
 
+dhcp_cname_add() {
+	local cfg="$1"
+	local cname target
+
+	config_get cname "$cfg" cname
+	[ -n "$cname" ] || return 0
+
+	config_get target "$cfg" target
+	[ -n "$target" ] || return 0
+
+	append args "--cname=${cname},${target}"
+}
+
 start() {
 	include /lib/network
 	scan_interfaces
+
+	local lanaddr
+	config_get lanaddr "lan" ipaddr
+
 	config_load dhcp
 
 	args=""
@@ -383,8 +402,15 @@ start() {
 	config_foreach dhcp_domain_add domain
 	config_foreach dhcp_srv_add srvhost
 	config_foreach dhcp_add dhcp
+	config_foreach dhcp_cname_add cname
+
+	# add own hostname
+	[ -z "$lanaddr" ] || {
+		local hostname="$(uci_get system.@system[0].hostname)"
+		dhcp_domain_add "" "${hostname:-OpenWrt}" "$lanaddr"
+	}
 
-	/usr/sbin/dnsmasq $args && {
+	service_start /usr/sbin/dnsmasq $args && {
 		rm -f /tmp/resolv.conf
 		[ -n "$DOMAIN" ] && echo "search $DOMAIN" >> /tmp/resolv.conf
 		DNS_SERVERS="$DNS_SERVERS 127.0.0.1"
@@ -395,10 +421,10 @@ start() {
 }
 
 stop() {
-	[ -f /tmp/resolv.conf ] && {
-		rm -f /tmp/resolv.conf
-		ln -s /tmp/resolv.conf.auto /tmp/resolv.conf
+	service_stop /usr/sbin/dnsmasq && {
+		[ -f /tmp/resolv.conf ] && {
+			rm -f /tmp/resolv.conf
+			ln -s /tmp/resolv.conf.auto /tmp/resolv.conf
+		}
 	}
-	service_kill dnsmasq /var/run/dnsmasq.pid
-	return 0
 }