[package] fix aiccu heartbeat option parsing, thanks to Malte S. Stretz

[openwrt/svn-archive/archive.git] / ipv6 / aiccu / files / aiccu.init

diff --git a/ipv6/aiccu/files/aiccu.init b/ipv6/aiccu/files/aiccu.init
index a18e7963e801f77efe33e9954e1ee4b5539d32e1..56de87dcef450178db39c9494a1e1e1a4416e48d 100644 (file)
--- a/ipv6/aiccu/files/aiccu.init
+++ b/ipv6/aiccu/files/aiccu.init
@@ -15,7 +15,7 @@ config_cb() {
 
 start() {
        config_load aiccu
-       for cfgs_section $cfgs_sections; do
+       for cfgs_section in $cfgs_sections; do
                config_get username $cfgs_section username
                config_get password $cfgs_section password
                config_get server $cfgs_section server
@@ -25,18 +25,19 @@ start() {
                config_get_bool requiretls $cfgs_section requiretls 0
                config_get_bool defaultroute $cfgs_section defaultroute 1
                config_get_bool nat $cfgs_section nat 1
-               config_get_bool heartbeat $cfgs_section heatbeat 1
+               config_get_bool heartbeat $cfgs_section heartbeat 1
                mkdir -p /tmp/run
                echo "username $username" > /tmp/run/aiccu-${cfgs_section}.conf
                echo "password $password" >> /tmp/run/aiccu-${cfgs_section}.conf
                [ -n "$server" ] && echo "server $server" >> /tmp/run/aiccu-${cfgs_section}.conf
                [ -n "$protocol" ] && echo "protocol $protocol" >> /tmp/run/aiccu-${cfgs_section}.conf
-               [ -n "$interface" ] && echo "interface $interface" >> /tmp/run/aiccu-${cfgs_section}.conf
-               [ -n "$tunnel_id" ] && echo "tunnel_id $tunnel_id" >> /tmp/run/aiccu-${cfgs_section}.conf || echo "tunnel_id aiccu" >> /tmp/run/aiccu-${cfgs_section}.conf
+               [ -n "$interface" ] && echo "ipv6_interface $interface" >> /tmp/run/aiccu-${cfgs_section}.conf
+               [ -n "$tunnel_id" ] && echo "tunnel_id $tunnel_id" >> /tmp/run/aiccu-${cfgs_section}.conf
                [ "$requiretls" = "1" ] && echo "requiretls true" >> /tmp/run/aiccu-${cfgs_section}.conf
                [ "$defaultroute" != "1" ] && echo "defaultroute false >> /tmp/run/aiccu-${cfgs_section}.conf
                [ "$nat" = "1" ] && echo "behindnat true >> /tmp/run/aiccu-${cfgs_section}.conf
                [ "$heartbeat" != "1" ] && echo "makebeats false" >> /tmp/run/aiccu-${cfgs_section}.conf
+               echo 'daemonize true' >> /tmp/run/aiccu-${cfgs_section}.conf
                echo "pidfile /var/run/aiccu-${cfgs_section}.pid" >> /tmp/run/aiccu-${cfgs_section}.conf
        
                aiccu start /tmp/run/aiccu-$cfgs_section.conf
@@ -44,5 +45,8 @@ start() {
 }
 
 stop() {
-       aiccu stop
+       config_load aiccu
+       for cfgs_section in $cfgs_sections; do
+               aiccu stop /tmp/run/aiccu-$cfgs_section.conf
+       done
 }