Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-04-19 05:40:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1292 from pi-hole/master

Browse source 
Merge patches back into devel
This commit is contained in:
DL6ER 2017-03-03 23:45:29 +01:00 • committed by GitHub
commit f2fe84c9d3
3 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
automated install/basic-install.sh
View file

@ -619,6 +619,7 @@ version_check_dnsmasq() {
echo -n "::: Copying 01-pihole.conf to /etc/dnsmasq.d/01-pihole.conf..."
cp ${dnsmasq_pihole_01_snippet} ${dnsmasq_pihole_01_location}
echo " done."
sed -i "s/@INT@/$PIHOLE_INTERFACE/" ${dnsmasq_pihole_01_location}
if [[ "${PIHOLE_DNS_1}" != "" ]]; then
sed -i "s/@DNS1@/$PIHOLE_DNS_1/" ${dnsmasq_pihole_01_location}
else