Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-25 06:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove conflicted merge markup. Not sure how that got through.

Browse source
This commit is contained in:
Promofaux 2016-02-20 16:08:02 +00:00
parent 2d895f328c
commit f397844603
1 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
automated install/basic-install.sh
View file

@ -117,7 +117,6 @@ welcomeDialogs() {
verifyFreeDiskSpace() { verifyFreeDiskSpace() {
<<<<<<< HEAD
# 25MB is the minimum space needed (20MB install + 5MB one day of logs.) # 25MB is the minimum space needed (20MB install + 5MB one day of logs.)
requiredFreeBytes=25600 requiredFreeBytes=25600
@ -131,20 +130,6 @@ verifyFreeDiskSpace() {
echo "Insufficient free space, exiting..." echo "Insufficient free space, exiting..."
exit 1 exit 1
fi fi
=======
# 25MB is the minimum space needed (20MB install + 5MB one day of logs.)
requiredFreeBytes=25600
existingFreeBytes=`df -lk / 2>&1 | awk '{print $4}' | head -2 | tail -1`
if ! [[ "$existingFreeBytes" =~ ^[0-9]\+$ ]]; then
existingFreeBytes=`df -lk /dev 2>&1 | awk '{print $4}' | head -2 | tail -1`
fi
if [[ $existingFreeBytes -lt $requiredFreeBytes ]]; then
whiptail --msgbox --backtitle "Insufficient Disk Space" --title "Insufficient Disk Space" "\nYour system appears to be low on disk space. pi-hole recomends a minimum of $requiredFreeBytes Bytes.\nYou only have $existingFreeBytes Free.\n\nIf this is a new install you may need to expand your disk.\n\nTry running:\n 'sudo raspi-config'\nChoose the 'expand file system option'\n\nAfter rebooting, run this installation again.\n\ncurl -L install.pi-hole.net | bash\n" $r $c
exit 1
fi
>>>>>>> development
} }