Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-28 17:13:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

set static ip and suppress more output

Browse source 
Created a function to set a static IP address.

I also sent STDOUT and STDERR to /dev/null so it doesn't mangle the
progress bar.  When the device reboots, it still gets mangled a bit
(via ssh).
This commit is contained in:
Jacob Salmela 2015-10-31 09:11:29 -05:00
parent 4dab16faa6
commit 48973b195f
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
automated install/basic-install.sh
View file

@ -27,7 +27,10 @@ IPv4mask=$(ifconfig | awk -F':' '/inet addr/ && !/127.0.0.1/ {print $4}')
IPv4gw=$(ip route show | awk '/default\ via/ {print $3}') IPv4gw=$(ip route show | awk '/default\ via/ {print $3}')
# IPv6 support to be added later # IPv6 support to be added later
IPv6addr=$(ip addr show | awk '/scope\ global/ && /ff:fe/ {print $2}' | cut -d'/' -f1) #IPv6addr=$(ip addr show | awk '/scope\ global/ && /ff:fe/ {print $2}' | cut -d'/' -f1)
ethernetDevice="eth0"
dhcpcdFile=/etc/dhcpcd.conf
####### FUCNTIONS ########## ####### FUCNTIONS ##########
backupLegacyPihole() backupLegacyPihole()
@ -46,6 +49,15 @@ else
fi fi
} }
set_static_ip()
{
# Append these lines to /etc/dhcpcd.conf to enable a static IP
echo "interface $ethernetDevice
static ip_address=$IPv4addr/24
static routers=$IPv4gw
static domain_name_servers=$IPv4gw" | sudo tee -a $dhcpcdFile >/dev/null
}
######## SCRIPT ############ ######## SCRIPT ############
# Just back up the original Pi-hole right away since it won't take long and it gets it out of the way # Just back up the original Pi-hole right away since it won't take long and it gets it out of the way
backupLegacyPihole backupLegacyPihole
@ -59,7 +71,7 @@ whiptail --msgbox --backtitle "Initating network interface" --title "Static IP N
In the next section, you can choose to use your current network settings (DHCP) or to manually edit them." $r $c In the next section, you can choose to use your current network settings (DHCP) or to manually edit them." $r $c
# Ask if the user wannts to use DHCP settings as their static IP # Ask if the user wannts to use DHCP settings as their static IP
if (whiptail --title "Static IP Address" --yesno "Do you want to use your current network settings as a static address? if (whiptail --backtitle "Calibrating network interface" --title "Static IP Address" --yesno "Do you want to use your current network settings as a static address?
IP address: $IPv4addr IP address: $IPv4addr
Subnet mask: $IPv4mask Subnet mask: $IPv4mask
@ -90,7 +102,7 @@ else
if [[ $? = 0 ]];then if [[ $? = 0 ]];then
echo "Your static IPv4 gateway: $IPv4gw" echo "Your static IPv4 gateway: $IPv4gw"
# Give the user a chance to review their settings before moving on # Give the user a chance to review their settings before moving on
if (whiptail --title "Static IP Address" --yesno "Are these settings correct? if (whiptail --backtitle "Calibrating network interface" --title "Static IP Address" --yesno "Are these settings correct?
IP address: $IPv4addr IP address: $IPv4addr
Subnet mask: $IPv4mask Subnet mask: $IPv4mask
Gateway: $IPv4gw" $r $c)then Gateway: $IPv4gw" $r $c)then
@ -125,6 +137,8 @@ else
done done
# End the if statement for DHCP vs. static # End the if statement for DHCP vs. static
fi fi
# Set the static address
set_static_ip
# These are the commands to actually install the Pi-hole # These are the commands to actually install the Pi-hole
# This is pretty ugly, but it works to present a nice front-end # This is pretty ugly, but it works to present a nice front-end
@ -186,11 +200,11 @@ $percent
Step $i of $n: ${echoes[$k]} Step $i of $n: ${echoes[$k]}
XXX XXX
EOF EOF
# Execute the command in the background (hidden from the user, not actually a background process) # Execute the command in the background (hidden from the user, not actually a background process)
#${echoes[$k]} ${commands[${echoes[$k]}]} > /dev/null 2>&1
${commands[${echoes[$k]}]}
sleep 1
done done
# As the loop is progressing, the output is sent to whiptail to be displayed to the user # As the loop is progressing, the output is sent to whiptail to be displayed to the user
) | ) |
whiptail --title "Opening your Pi-hole..." --gauge "Please wait..." $r $c 0 whiptail --title "Opening your Pi-hole..." --gauge "Please wait..." $r $c 0