arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2025-02-23 21:42:09 +00:00
Code Issues Releases Wiki Activity

Merge branch 'development' into centos-nc

Browse Source
This commit is contained in:
Blayne Campbell 2016-07-19 08:48:54 -06:00 committed by GitHub
commit c647e27e15
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
advanced/Scripts/piholeDebug.sh
View File

@ -69,7 +69,7 @@ function distroCheck {
echo "######## Distribution Section #########" >> $DEBUG_LOG echo "######## Distribution Section #########" >> $DEBUG_LOG
echo "#######################################" >> $DEBUG_LOG echo "#######################################" >> $DEBUG_LOG
TMP=$(cat /etc/*release/ || echo "Failed to find release") TMP=$(cat /etc/*release || echo "Failed to find release")
echo "Distribution Version: $TMP" >> $DEBUG_LOG echo "Distribution Version: $TMP" >> $DEBUG_LOG
} }

2
automated install/basic-install.sh
View File

@ -324,7 +324,7 @@ It is also possible to use a DHCP reservation, but if you are going to do that,
setDHCPCD() { setDHCPCD() {
# Append these lines to dhcpcd.conf to enable a static IP # Append these lines to dhcpcd.conf to enable a static IP
echo "::: interface $piholeInterface echo "## interface $piholeInterface
static ip_address=$IPv4addr static ip_address=$IPv4addr
static routers=$IPv4gw static routers=$IPv4gw
static domain_name_servers=$IPv4gw" | $SUDO tee -a /etc/dhcpcd.conf >/dev/null static domain_name_servers=$IPv4gw" | $SUDO tee -a /etc/dhcpcd.conf >/dev/null