aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorficus <ficus@robocracy.org>2012-11-23 19:20:27 +0100
committerficus <ficus@robocracy.org>2012-11-23 19:20:27 +0100
commit9a194ad34d89ac97468de0aaa0d45a0be0eb4237 (patch)
treef4811413401c999990f0ec05c5eb826d815e30ac
parent6d09271d70fa528b1e546dad0d6f5d1697e5c027 (diff)
downloadtorouter-live-9a194ad34d89ac97468de0aaa0d45a0be0eb4237.tar.gz
torouter-live-9a194ad34d89ac97468de0aaa0d45a0be0eb4237.zip
move ipv4 forwarding to sysctl
-rw-r--r--config/includes.chroot/etc/network/interfaces1
-rw-r--r--config/includes.chroot/etc/sysctl.conf3
2 files changed, 3 insertions, 1 deletions
diff --git a/config/includes.chroot/etc/network/interfaces b/config/includes.chroot/etc/network/interfaces
index 3787ff9..7d11e36 100644
--- a/config/includes.chroot/etc/network/interfaces
+++ b/config/includes.chroot/etc/network/interfaces
@@ -19,7 +19,6 @@ iface eth1 inet static
network 10.23.42.0
broadcast 10.23.42.255
pre-up ip addr del 10.23.42.1/24 dev eth1 || true
- post-up echo 1 > /proc/sys/net/ipv4/ip_forward
post-up /etc/init.d/dnsmasq_lan start
# this must happen after have brought up uap0 because it clears the NAT
# tables
diff --git a/config/includes.chroot/etc/sysctl.conf b/config/includes.chroot/etc/sysctl.conf
index b8460d0..b0afe72 100644
--- a/config/includes.chroot/etc/sysctl.conf
+++ b/config/includes.chroot/etc/sysctl.conf
@@ -18,3 +18,6 @@ net.ipv4.conf.all.secure_redirects = 1
net.ipv4.conf.default.rp_filter=1
net.ipv4.conf.all.rp_filter=1
+# Forwardings
+net.ipv4.ip_forward=1
+