summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@googlemail.com>2014-01-13 13:58:26 +0100
committerlassulus <lassulus@googlemail.com>2014-01-13 13:58:26 +0100
commit186dd46dac834541dd9506acf05ed6903cf5add6 (patch)
tree92fc49766621b82b79353e30b451f15b0fbf70ae
parent50c2347e32640b8472b4b100466576979f72eec9 (diff)
tinc-up: no need to get name
-rwxr-xr-xretiolum/scripts/tinc_setup/tinc-up6
1 files changed, 2 insertions, 4 deletions
diff --git a/retiolum/scripts/tinc_setup/tinc-up b/retiolum/scripts/tinc_setup/tinc-up
index 043e1e46..acb81b5d 100755
--- a/retiolum/scripts/tinc_setup/tinc-up
+++ b/retiolum/scripts/tinc_setup/tinc-up
@@ -4,9 +4,7 @@ dirname="`dirname "$0"`"
conf=$dirname/tinc.conf
-name=`sed -n 's|^ *Name *= *\([^ ]*\) *$|\1|p' $conf`
-
-host=$dirname/hosts/$name
+host=$dirname/hosts/$NAME
ip link set $INTERFACE up
@@ -16,5 +14,5 @@ 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
+ip -6 addr add $addr6 dev $INTERFACE || exit 0
ip -6 route add 42::/16 dev $INTERFACE