Merge pull request #6268 from pprindeville/dhcp-update-resolv.conf

isc-dhcp: write resolv.conf per network & dhcp settings
openwrt · Jun 12, 2018 · 7716f41 · 7716f41
2 parents c44ccef + db6adb6
commit 7716f41
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/net/isc-dhcp/Makefile b/net/isc-dhcp/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=isc-dhcp
 UPSTREAM_NAME:=dhcp
 PKG_VERSION:=4.4.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE

diff --git a/net/isc-dhcp/files/dhcpd.init b/net/isc-dhcp/files/dhcpd.init
@@ -263,6 +263,11 @@ general_config() {
 	echo "max-lease-time $max_lease_time;"
 
 	[ -n "$domain" ] && echo "option domain-name \"$domain\";"
+
+	rm -f /tmp/resolv.conf
+	echo "# This file is generated by the DHCPD service" > /tmp/resolv.conf
+	[ -n "$domain" ] && echo "domain $domain" >> /tmp/resolv.conf
+	echo "nameserver 127.0.0.1" >> /tmp/resolv.conf
 }
 
 start_service() {