summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@googlemail.com>2013-12-29 13:43:45 +0100
committerlassulus <lassulus@googlemail.com>2013-12-29 13:43:45 +0100
commitfd1144b06d602581270a310d9e15476c07873335 (patch)
treef38974c1cf0f4ac2b5eefa739f11c8cb32bdd4d4
parentd4810aa259db504383cacbee855be9ec8f6b1cf5 (diff)
retiolum: updated build scripts
-rwxr-xr-xretiolum/Makefile2
-rwxr-xr-xretiolum/scripts/tinc_setup/tinc-up11
2 files changed, 3 insertions, 10 deletions
diff --git a/retiolum/Makefile b/retiolum/Makefile
index b3a3c124..950099f4 100755
--- a/retiolum/Makefile
+++ b/retiolum/Makefile
@@ -9,8 +9,6 @@ links:
install: upgrade
- ../punani/bin/punani install tinc python
- scripts/tinc_setup/install.sh
sudo cp scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up
upgrade: update
diff --git a/retiolum/scripts/tinc_setup/tinc-up b/retiolum/scripts/tinc_setup/tinc-up
index a829528d..043e1e46 100755
--- a/retiolum/scripts/tinc_setup/tinc-up
+++ b/retiolum/scripts/tinc_setup/tinc-up
@@ -11,14 +11,9 @@ host=$dirname/hosts/$name
ip link set $INTERFACE up
addr4=`sed -n 's|^ *Subnet *= *\(10[.][^ ]*\) *$|\1|p' $host`
-if [ "$addr4" != '' ];then
- ip -4 addr add $addr4 dev $INTERFACE
- ip -4 route add 10.243.0.0/16 dev $INTERFACE
-else
- addr4=`sed -n 's|^ *Subnet *= *\(42[.][^ ]*\) *$|\1|p' $host`
- ip -4 addr add $addr4 dev $INTERFACE
- ip -4 route add 42.0.0.0/16 dev $INTERFACE
-fi
+ip -4 addr add $addr4 dev $INTERFACE
+ip -4 route add 10.243.0.0/16 dev $INTERFACE
+ip -4 route add 172.22.0.0/15 dev $INTERFACE
addr6=`sed -n 's|^ *Subnet *= *\(42[:][^ ]*\) *$|\1|p' $host`
ip -6 addr add $addr6 dev $INTERFACE