Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

[people/pmueller/ipfire-2.x.git] / src / initscripts / init.d / hostapd

diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/init.d/hostapd
index bbdb24f44e0697edc1a98d0cb0b812aa6176ab36..bb0da480b66261ef21d12ffad47c3a1e81486ae0 100644 (file)
--- a/src/initscripts/init.d/hostapd
+++ b/src/initscripts/init.d/hostapd
@@ -9,48 +9,42 @@ eval $(/usr/local/bin/readhash /var/ipfire/wlanap/settings)
 
 case "${1}" in
         start)
-               boot_mesg "Starting hostapd... "
                mkdir -p /var/run/hostapd
-               # enable wlan module of collectd
-               sed -i -e "s|#LoadPlugin wireless|LoadPlugin wireless|g" /etc/collectd.conf
+               if [ "$(/usr/sbin/iwconfig $INTERFACE | /bin/grep "Mode:Master")" == "" ]; then
+
+                   boot_mesg "Setting wlan $INTERFACE to Master mode... "
 
-               # Set Atheros Cards to master mode
-               /usr/bin/wlanconfig $INTERFACE destroy > /dev/null
-                /usr/bin/wlanconfig $INTERFACE create wlandev wifi0 wlanmode ap > /dev/null
+                   # Set Atheros Cards to master mode
+                   if [ -d /proc/net/madwifi/ath0/ ]; then
+                       /usr/bin/wlanconfig ath0 destroy > /dev/null
+                   fi
 
-               # Set other cards to master mode
-               #/usr/sbin/iwconfig blue0 mode master
+                   /usr/bin/wlanconfig $INTERFACE destroy > /dev/null
+                   /usr/bin/wlanconfig $INTERFACE create wlandev wifi0 wlanmode ap > /dev/null
 
+                   # Set other cards to master mode
+                   #/usr/sbin/iwconfig blue0 mode master
+               fi
+               
                if [ "$(/usr/sbin/iwconfig $INTERFACE | /bin/grep "Mode:Master")" == "" ]; then
                    boot_mesg "Error! Can't set wlan master mode"
                    echo_failure;
                    exit 1;
                else
+                   # enable wlan module of collectd
+                   sed -i -e "s|#LoadPlugin wireless|LoadPlugin wireless|g" /etc/collectd.conf
+
+                   boot_mesg "Starting hostapd... "
                    /usr/sbin/iwconfig $INTERFACE channel $CHANNEL
                    /usr/sbin/iwconfig $INTERFACE txpower $TXPOWER
                    /usr/bin/hostapd -P /var/run/hostapd /etc/hostapd.conf </dev/tty12 >/dev/tty12 2>&1 &
                    evaluate_retval
                fi
-
-               # Bring blue up (but not at boot)
-               if [ "$(basename $0)" == "hostapd" ]; then
-                   /etc/rc.d/init.d/networking/blue start
-                   if [ -f /var/ipfire/dhcp/enable_blue ]; then
-                       /etc/rc.d/init.d/dhcp restart
-                   fi
-               fi
-                ;;
+;;
 
         stop)
                boot_mesg "Stopping hostapd..."
 
-               # Set Atheros Card to managed mode
-                /usr/bin/wlanconfig $INTERFACE destroy > /dev/null
-                /usr/bin/wlanconfig $INTERFACE create wlandev wifi0 wlanmode sta > /dev/null
-
-               # Set other cards to managed mode
-               #/usr/sbin/iwconfig blue0 mode Managed
-
                 killproc /usr/bin/hostapd
                 evaluate_retval
                 ;;