diff options
| author | Felix Richter <Felix.Richter@syntax-fehler.de> | 2011-05-27 17:07:04 +0200 |
|---|---|---|
| committer | Felix Richter <Felix.Richter@syntax-fehler.de> | 2011-05-27 17:07:04 +0200 |
| commit | e338c4d436efcb2661740a7d49fdc782b8a8a4e0 (patch) | |
| tree | 44f201f07bbfaa8af4531654f3790ed05435f2ac /modules/retiolum/scripts/tinc_setup/install.sh | |
| parent | 402a70a9c1df350cf6911ec5b1372d7c1efdc6b4 (diff) | |
| parent | 44f7bd49755aab8434fad4a42b96e68c7924fa19 (diff) | |
resolved conflict in install.sh
Diffstat (limited to 'modules/retiolum/scripts/tinc_setup/install.sh')
| -rwxr-xr-x | modules/retiolum/scripts/tinc_setup/install.sh | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/modules/retiolum/scripts/tinc_setup/install.sh b/modules/retiolum/scripts/tinc_setup/install.sh index 8834aafc..de7d2225 100755 --- a/modules/retiolum/scripts/tinc_setup/install.sh +++ b/modules/retiolum/scripts/tinc_setup/install.sh @@ -4,7 +4,7 @@ make -C ../../ update set -e -CURR=`pwd` +CURR=`dirname "$0"` MYBIN=../../bin netname=retiolum # create configuration directory for $netname @@ -47,18 +47,7 @@ else echo "own host file already exists! will not write again!" fi - -myipv6=${myipv6-`sed -rn 's|^Subnet *= *(42:[0-9A-Fa-f:]*/128)|\1|p' /etc/tinc/$netname/hosts/$myname`} - -cat>tinc-up<<EOF -#! /bin/sh -ifconfig \$INTERFACE up $myipv4/24 -route add -net $mynet4/24 dev \$INTERFACE -ip -6 addr add ${myipv6} dev \$INTERFACE -ip -6 route add 42::/16 dev \$INTERFACE -EOF - -chmod +x tinc-up +cp $CURR/tinc-up . cat>tinc.conf<<EOF Name = $myname |