From 48afc21624cadd018e1e5c181d0c91536a38c3a3 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 20 Apr 2018 12:38:59 +0100
Subject: [PATCH] Tidying

---
 src/freedombone-utils-onion | 31 -------------------------------
 src/freedombone-utils-setup |  3 ---
 2 files changed, 34 deletions(-)

diff --git a/src/freedombone-utils-onion b/src/freedombone-utils-onion
index 8a002885..a68220f0 100755
--- a/src/freedombone-utils-onion
+++ b/src/freedombone-utils-onion
@@ -342,37 +342,6 @@ function install_tor {
     mark_completed "${FUNCNAME[0]}"
 }
 
-function resolve_dns_via_tor {
-    if [[ $SYSTEM_TYPE == "mesh"* ]]; then
-        return
-    fi
-    if [[ $(is_completed "${FUNCNAME[0]}") == "1" ]]; then
-        return
-    fi
-    if [ ! -f /etc/tor/torrc ]; then
-        echo $'tor was not installed'
-        exit 52952
-    fi
-
-    # resolve DNS via tor
-    if ! grep -q 'DNSPort 53' /etc/tor/torrc; then
-        { echo 'DNSPort 53';
-          echo 'AutomapHostsOnResolve 1';
-          echo 'AutomapHostsSuffixes .exit,.onion'; } >> /etc/tor/torrc
-        onion_update
-    fi
-
-    # don't change resolv.conf
-    sed -i 's|, domain-name-servers||g' /etc/dhcp/dhclient.conf
-
-    # point resolv.conf to tor
-    resolvconf=/etc/resolvconf/resolv.conf.d/head
-    echo 'nameserver 127.0.0.1:53' > $resolvconf
-    resolvconf -u
-
-    mark_completed "${FUNCNAME[0]}"
-}
-
 # see https://trac.torproject.org/projects/tor/wiki/doc/TransparentProxy
 # Local Redirection and Anonymizing Middlebox
 function route_outgoing_traffic_through_tor {
diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup
index fd208d61..af83ae27 100755
--- a/src/freedombone-utils-setup
+++ b/src/freedombone-utils-setup
@@ -903,9 +903,6 @@ function setup_utils {
     function_check install_tor
     install_tor
 
-    #function_check resolve_dns_via_tor
-    #resolve_dns_via_tor
-
     function_check install_command_line_browser
     install_command_line_browser