dhcpd has also restarted at hostapd start

[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 a6b0575f30057de586ce44badf82812ba2eda093..e6149adcb458406af731fd25a092650b6dc5a8a2 100644 (file)
--- a/src/initscripts/init.d/hostapd
+++ b/src/initscripts/init.d/hostapd
@@ -2,24 +2,53 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
+CHANNEL="05"
+TXPOWER="auto"
+INTERFACE="blue0"
+eval $(/usr/local/bin/readhash /var/ipfire/wlanap/settings)
+
 case "${1}" in
         start)
-               boot_mesg -n "Starting hostapd... "
+               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
-                /usr/bin/wlanconfig ath0 destroy
-                /usr/bin/wlanconfig blue0 create wlandev wifi0 wlanmode ap
-                /usr/sbin/iwconfig blue0 channel 05
-                /usr/bin/hostapd -P /var/run/hostapd /etc/hostapd.conf </dev/tty12 >/dev/tty12 2>&1 &
-                evaluate_retval
+
+               # 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 other cards to master mode
+               #/usr/sbin/iwconfig blue0 mode master
+
+               if [ "$(/usr/sbin/iwconfig $INTERFACE | /bin/grep "Mode:Master")" == "" ]; then
+                   boot_mesg "Error! Can't set wlan master mode"
+                   echo_failure;
+                   exit 1;
+               else
+                   /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
+                   /etc/rc.d/init.d/dhcp restart
+               fi
                 ;;
 
         stop)
                boot_mesg "Stopping hostapd..."
-                # Just make sure when going down the first time blue0 nw values are ignored
-               grep -v 'NAME="blue0"' /etc/udev/rules.d/30-persistent-network.rules > /tmp/30-persistent-network.rules
-               mv /tmp/30-persistent-network.rules /etc/udev/rules.d/30-persistent-network.rules
-               /usr/bin/wlanconfig blue0 destroy
+
+               # 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
                 ;;