Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
isc-dhcp: write resolv.conf per network & dhcp settings
This commit is contained in:
Philip Prindeville 2018-06-12 17:20:06 -06:00 committed by GitHub
commit 7716f410c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/isc-dhcp/Makefile
View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=isc-dhcp PKG_NAME:=isc-dhcp
UPSTREAM_NAME:=dhcp UPSTREAM_NAME:=dhcp
PKG_VERSION:=4.4.1 PKG_VERSION:=4.4.1
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE

5
net/isc-dhcp/files/dhcpd.init
View file

@ -263,6 +263,11 @@ general_config() {
echo "max-lease-time $max_lease_time;" echo "max-lease-time $max_lease_time;"
[ -n "$domain" ] && echo "option domain-name \"$domain\";" [ -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() { start_service() {