From 46868985194cf4c1369fddce207709e5cc407faf Mon Sep 17 00:00:00 2001
From: Jason Mehring <nrgaway@gmail.com>
Date: Sun, 26 Oct 2014 14:46:20 -0400
Subject: [PATCH] Fix enable tor regression

---
 .../02_install_groups_packages_installed.sh          |  4 ++--
 .../wheezy+whonix/04_install_qubes_post.sh           | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts_debian/wheezy+whonix/02_install_groups_packages_installed.sh b/scripts_debian/wheezy+whonix/02_install_groups_packages_installed.sh
index c3f8d3e..82d9372 100755
--- a/scripts_debian/wheezy+whonix/02_install_groups_packages_installed.sh
+++ b/scripts_debian/wheezy+whonix/02_install_groups_packages_installed.sh
@@ -84,11 +84,11 @@ popd
 
 pushd /etc
 sudo rm -f resolv.conf
-sudo ln -s resolv.conf.backup resolv.conf
+sudo cp -p resolv.conf.backup resolv.conf
 popd
 
 # Enable Tor
-if [ "${1}" == "whonix-gateway" ]; then
+if [ "${1}" == "--torgateway" ]; then
     sudo sed -i 's/#DisableNetwork 0/DisableNetwork 0/g' /etc/tor/torrc
 fi
 
diff --git a/scripts_debian/wheezy+whonix/04_install_qubes_post.sh b/scripts_debian/wheezy+whonix/04_install_qubes_post.sh
index ad34e9c..b9e7e50 100755
--- a/scripts_debian/wheezy+whonix/04_install_qubes_post.sh
+++ b/scripts_debian/wheezy+whonix/04_install_qubes_post.sh
@@ -38,12 +38,12 @@ fi
 # ------------------------------------------------------------------------------
 # Restore whonix resolv.conf
 # ------------------------------------------------------------------------------
-if [ -L "$INSTALLDIR/etc/resolv.conf" ]; then
-    pushd "$INSTALLDIR/etc"
-    sudo rm -f resolv.conf
-    sudo ln -s resolv.conf.anondist resolv.conf
-    popd
-fi
+pushd "$INSTALLDIR/etc"
+{
+    rm -f resolv.conf
+    cp -p resolv.conf.anondist resolv.conf
+}
+popd
 
 # --------------------------------------------------------------------------
 # Copy over any extra files that may be needed that are located in