aboutsummaryrefslogtreecommitdiffstats
path: root/core/network.html
diff options
context:
space:
mode:
authorSilvino Silva <silvino@bk.ru>2016-09-28 06:50:12 +0100
committerSilvino Silva <silvino@bk.ru>2016-09-28 06:50:12 +0100
commit17bc450495c9ab6933590fb825dbd80b0af64a66 (patch)
tree0094413a690a66d6a061b4b52f5d304b99199a97 /core/network.html
parentba6cbac7b30288ac5582f37a3e0e1ba323b83b75 (diff)
downloaddoc-17bc450495c9ab6933590fb825dbd80b0af64a66.tar.gz
fix core network bad merge
Diffstat (limited to 'core/network.html')
-rw-r--r--core/network.html21
1 files changed, 0 insertions, 21 deletions
diff --git a/core/network.html b/core/network.html
index ce4643b..b8b7617 100644
--- a/core/network.html
+++ b/core/network.html
@@ -113,16 +113,8 @@
configure nat and filtering;</p>
<pre>
-<<<<<<< HEAD
# mkdir /etc/iptables
# cp c9-doc/core/scripts/iptables.sh /etc/iptables/
-=======
- DEV=tap0
- ADDR=10.0.0.1
- NET=10.0.0.0
- MASK=24
- GW=10.0.0.1
->>>>>>> core network revision
</pre>
<p>Adjust iptables to your needs, then;</p>
@@ -137,22 +129,9 @@
let drop when you call stop.</p>
<pre>
-<<<<<<< HEAD
# cp c9-doc/core/conf/rc.d/iptables /etc/rc.d/
# vim /etc/rc.d/iptables
# chmod +x /etc/rc.d/iptables
-=======
- # ip link add name ${DEV} type bridge
- # ip link set dev ${DEV} up
-
- # ip addr add ${ADDR}/${MASK} dev ${DEV} broadcast 10.0.0.255
- # ip addr add 0.0.0.0/${MASK} dev ${DEV} broadcast +
-
- # ip tuntap add ${TAP} mode tap group kvm
- # ip link set dev ${TAP} up
-
- # ip link set dev ${TAP} master ${DEV}
->>>>>>> core network revision
</pre>
<p>Re-configure your rc.conf and add iptables before (w)lan is up;</p>