diff options
| author | makefu <github@syntax-fehler.de> | 2013-01-06 11:58:57 +0700 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2013-01-06 11:58:57 +0700 |
| commit | 9f8c86cce1d31cff069387920e3c2d3294b74e39 (patch) | |
| tree | 2f319caec1cdf76c404eb230799b5de151dfe452 /retiolum/scripts/tinc_setup/new_install.sh | |
| parent | 5d777ccc8d1291f00c59e7725ffb1996a43154f3 (diff) | |
| parent | 99e9301be379f466948d1be30f7b97285027b062 (diff) | |
Merge branch 'master' of github.com:krebscode/painload
Diffstat (limited to 'retiolum/scripts/tinc_setup/new_install.sh')
| -rwxr-xr-x | retiolum/scripts/tinc_setup/new_install.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh index 7433d7b1..1d16cfb9 100755 --- a/retiolum/scripts/tinc_setup/new_install.sh +++ b/retiolum/scripts/tinc_setup/new_install.sh @@ -334,7 +334,7 @@ AutoConnect = 3 #ConnectTos ConnectTo = supernode -ConnectTo = euer +ConnectTo = pigstarter ConnectTo = pico EOF @@ -346,17 +346,17 @@ if type ip >/dev/null; then echo '' >> tinc-up echo 'conf=$dirname/tinc.conf' >> tinc-up echo '' >> tinc-up - echo 'name=$(sed -n "s|^ *Name *= *\([^ ]*\) *$|\1|p " $conf)' >> tinc-up + echo 'name=$(sed -n "s|^ *Name *= *\([^ ]*\) *$|\\1|p" $conf)' >> tinc-up echo '' >> tinc-up echo 'host=$dirname/hosts/$name' >> tinc-up echo '' >> tinc-up echo 'ip link set $INTERFACE up' >> tinc-up echo '' >> tinc-up - echo "addr4=\$(sed -n \"s|^ *Subnet *= *\\($SUBNET4[.][^ ]*\\) *$|\\1|p\" \$host)" >> tinc-up + echo "addr4=\$(sed -n \"s|^ *Subnet *= *\\($SUBNET4[.][^ ]*\\) *\$|\\\\1|p\" \$host)" >> tinc-up echo 'ip -4 addr add $addr4 dev $INTERFACE' >> tinc-up echo "ip -4 route add $FULLSUBNET/$MASK4 dev \$INTERFACE" >> tinc-up echo '' >> tinc-up - echo "addr6=\$(sed -n \"s|^ *Subnet *= *\\($SUBNET6[:][^ ]*\\) *$|\\1|p\" \$host)" >> tinc-up + echo "addr6=\$(sed -n \"s|^ *Subnet *= *\\($SUBNET6[:][^ ]*\\) *\$|\\\\1|p\" \$host)" >> tinc-up echo 'ip -6 addr add $addr6 dev $INTERFACE' >> tinc-up echo "ip -6 route add $SUBNET6::/$MASK6 dev \$INTERFACE" >> tinc-up else @@ -364,11 +364,11 @@ else echo '' >> tinc-up echo 'conf=$dirname/tinc.conf' >> tinc-up echo '' >> tinc-up - echo 'name=$(sed -n "s|^ *Name *= *\([^ ]*\) *$|\1|p " $conf)' >> tinc-up + echo 'name=$(sed -n "s|^ *Name *= *\([^ ]*\) *$|\\1|p" $conf)' >> tinc-up echo '' >> tinc-up echo 'host=$dirname/hosts/$name' >> tinc-up echo '' >> tinc-up - echo "addr4=\$(sed -n \"s|^ *Subnet *= *\\($SUBNET4[.][^ ]*\\) *$|\\1|p\" \$host)" >> tinc-up + echo "addr4=\$(sed -n \"s|^ *Subnet *= *\\($SUBNET4[.][^ ]*\\) *$|\\\\1|p\" \$host)" >> tinc-up echo 'ifconfig $INTERFACE $addr4' >> tinc-up echo "route add -net $FULLSUBNET netmask $RMASK dev \$INTERFACE " >> tinc-up fi |