diff options
| author | Ian Leonard <antonlacon@gmail.com> | 2014-08-10 01:09:06 -0700 |
|---|---|---|
| committer | Ian Leonard <antonlacon@gmail.com> | 2014-08-10 01:09:06 -0700 |
| commit | f5a1d1bba66d293486dc74bbc1de767dc7054013 (patch) | |
| tree | 7685a0f8f7e195e22d93ab8ea8825a92d117e229 /ipv6 | |
| parent | d55f37ea1a920beea420a50f4104a3d4109b095a (diff) | |
| parent | 048e700bfc72247e425bd5ace12d90bbc39f8599 (diff) | |
Merge branch 'master' into license-updates
Signed-off-by: Ian Leonard <antonlacon@gmail.com>
Conflicts:
devel/patch/Makefile
multimedia/minidlna/Makefile
Diffstat (limited to 'ipv6')
| -rwxr-xr-x | ipv6/aiccu/files/aiccu.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipv6/aiccu/files/aiccu.sh b/ipv6/aiccu/files/aiccu.sh index 4340b2f4e..669e0e257 100755 --- a/ipv6/aiccu/files/aiccu.sh +++ b/ipv6/aiccu/files/aiccu.sh @@ -34,7 +34,7 @@ proto_aiccu_setup() { echo "ipv6_interface $link" >> "$CFGFILE" [ -n "$server" ] && echo "server $server" >> "$CFGFILE" [ -n "$protocol" ] && echo "protocol $protocol" >> "$CFGFILE" - [ -n "$tunnel_id" ] && echo "tunnel_id $tunnel_id" >> "$CFGFILE" + [ -n "$tunnelid" ] && echo "tunnel_id $tunnelid" >> "$CFGFILE" [ -n "$requiretls" ] && echo "requiretls $requiretls" >> "$CFGFILE" [ "$nat" == 1 ] && echo "behindnat true" >> "$CFGFILE" [ "$heartbeat" == 1 ] && echo "makebeats true" >> "$CFGFILE" |