Merge pull request #607 from pi-hole/Debug_Options

Debug options

advanced/Scripts/piholeDebug.sh

@@ -338,7 +338,16 @@ function dumpPiHoleLog {
 # Anything to be done after capturing of pihole.log terminates
 function finalWork {
         echo "::: Finshed debugging!"
+    echo "::: The degug log can be uploaded to Termbin.com for easier sharing."
+        read -r -p "::: Would you like to upload the log? [y/N] " response
+    case $response in
+        [yY][eE][sS]|[yY])
             TERMBIN=$(cat /var/log/pihole_debug.log | nc termbin.com 9999)
+            ;;
+        *)
+            echo "::: Log will NOT be uploaded to Termbin."
+            ;;
+    esac
 
         # Check if termbin.com is reachable. When it's not, point to local log instead
         if [ -n "$TERMBIN" ]
@@ -348,6 +357,7 @@ function finalWork {
                 echo "::: Debug log can be found at : /var/log/pihole_debug.log"
         fi
 }
+
 trap finalWork EXIT
 
 ### Method calls for additional logging ###

automated install/basic-install.sh

@@ -359,7 +359,6 @@ setStaticIPv4() {
 			$SUDO echo "ONBOOT=yes" >> $IFCFG_FILE
 			$SUDO echo "IPADDR=$IPADDR" >> $IFCFG_FILE
 			$SUDO echo "PREFIX=$CIDR" >> $IFCFG_FILE
-			$SUDO echo "GATEWAY=$IPv4gw" >> $IFCFG_FILE
 			$SUDO echo "USERCTL=no" >> $IFCFG_FILE
 			$SUDO ip addr replace dev "$piholeInterface" "$IPv4addr"
 			if [ -x "$(command -v nmcli)" ];then