aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorficus <ficus@robocracy.org>2012-11-22 22:32:35 +0100
committerficus <ficus@robocracy.org>2012-11-22 22:32:35 +0100
commitf6b63e836919b95a32f99cefd8e06fdf0b4488dd (patch)
treef5c407fe1312a865454e76b56f5cb3f2d2df6a31
parent132f33fdcd42fd9b192a58d4737792fac3d1ddf5 (diff)
downloadtorouter-live-f6b63e836919b95a32f99cefd8e06fdf0b4488dd.tar.gz
torouter-live-f6b63e836919b95a32f99cefd8e06fdf0b4488dd.zip
tor enabled in defaults, disabled in rc*.d
-rwxr-xr-xconfig/hooks/disable-services.sh.chroot9
-rw-r--r--config/includes.chroot/etc/default/tor2
2 files changed, 10 insertions, 1 deletions
diff --git a/config/hooks/disable-services.sh.chroot b/config/hooks/disable-services.sh.chroot
new file mode 100755
index 0000000..c9cee1e
--- /dev/null
+++ b/config/hooks/disable-services.sh.chroot
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+echo "Disabling network services (they get run by network scripts)"
+update-rc.d tor disable
+update-rc.d dnsmasq disable
+update-rc.d ttdnsd disable
+
diff --git a/config/includes.chroot/etc/default/tor b/config/includes.chroot/etc/default/tor
index 44ddf15..68c0634 100644
--- a/config/includes.chroot/etc/default/tor
+++ b/config/includes.chroot/etc/default/tor
@@ -5,7 +5,7 @@
#
# This is a bash shell fragment
#
-RUN_DAEMON="no"
+RUN_DAEMON="yes"
#
# Servers sometimes may need more than the default 1024 file descriptors