babel: clean up init script, fix interface settings as with ahcpd

SVN-Revision: 18863

diff --git a/net/babel/files/babeld.config b/net/babel/files/babeld.config
index b512c3a20ff7efd01b5692d5b0d5089e4e2a3c76..3b0fb38fccd93a280cde87b75834179163f22d10 100644 (file)
--- a/net/babel/files/babeld.config
+++ b/net/babel/files/babeld.config
@@ -1,2 +1,2 @@
 config babeld
-       option interfaces "wl0"
+       #list 'interface' 'wlan'

diff --git a/net/babel/files/babeld.init b/net/babel/files/babeld.init
index 6d0eb192d199ce8ef5aa6579a3c180435bb03135..12fa90e2e87b30d08cd2fcc3dd8617c1f03b3aa8 100755 (executable)
--- a/net/babel/files/babeld.init
+++ b/net/babel/files/babeld.init
@@ -2,17 +2,17 @@
 
 START=70
 
-pidfile=/var/run/babeld.pid
-
-babeld_config() {
-       local cfg="$1"
-       config_get interfaces "$cfg" interfaces
+babel_addif() {
+       config_get ifname $1 ifname
+       append interfaces "$ifname"
 }
 
-start() {
-       config_load babeld
-       config_foreach babeld_config babeld
-       mkdir -p /var/lib
+babel_config() {
+       local cfg="$1"
+       interfaces=
+       config_list_foreach "$cfg" interface babel_addif
+       pidfile=/var/run/babeld-"$cfg".pid
+       [ -z "$interfaces" ] && return 0
        if [ -e $pidfile ] ; then
                echo "$pidfile exists -- not starting babel." >&2
        else
@@ -20,41 +20,19 @@ start() {
        fi
 }
 
-stop() {
-       [ -e $pidfile ] && kill $(cat $pidfile)
-       [ -e $pidfile ] && sleep 2
-       [ -e $pidfile ] && sleep 4
-       [ -e $pidfile ] && echo "Failed to stop babel ($pidfile still exists)."
-}
-#!/bin/sh /etc/rc.common
-
-START=70
-
-pidfile=/var/run/babeld.pid
-
-babel_config() {
-       local cfg="$1"
-       config_get interfaces "$cfg" interfaces
-}
-
 start() {
-       if [ -x /etc/rc.d/S71ahcpd ] ; then
+       if [ -x /etc/init.d/ahcpd ] && /etc/init.d/ahcpd enabled; then
                echo 'Not starting babel -- will be started by ahcpd.'
                exit 0
        fi
+       include /lib/network
+       scan_interfaces
        config_load babel
-       config_foreach babel_config babel
        mkdir -p /var/lib
-       if [ -e $pidfile ] ; then
-               echo "$pidfile exists -- not starting babel." >&2
-       else
-               /usr/sbin/babeld -D -I $pidfile $interfaces
-       fi
+       config_foreach babel_config babel
 }
 
 stop() {
-       [ -e $pidfile ] && kill $(cat $pidfile)
-       [ -e $pidfile ] && sleep 2
-       [ -e $pidfile ] && sleep 4
-       [ -e $pidfile ] && echo "Failed to stop babel ($pidfile still exists)."
+       kill $(cat /var/run/babeld-*.pid)
+       rm -f /var/run/babeld-*.pid
 }