Load libata prior udev at installer because some SATA doesnt autoload it

[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 6fa326e82eef7879936303f9da0acbacd935d261..bb0da480b66261ef21d12ffad47c3a1e81486ae0 100644 (file)
--- a/src/initscripts/init.d/hostapd
+++ b/src/initscripts/init.d/hostapd
@@ -2,21 +2,49 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
+CHANNEL="05"
+TXPOWER="auto"
+INTERFACE="blue0"
+eval $(/usr/local/bin/readhash /var/ipfire/wlanap/settings)
+
 case "${1}" in
         start)
-               # enable wlan module of collectd
-               sed -i -e "s|#LoadPlugin wireless|LoadPlugin wireless|g" /etc/collectd.conf
-                /usr/local/bin/wlanconfig ath0 destroy
-                /usr/local/bin/wlanconfig blue0 create wlandev wifi0 wlanmode ap
-                /usr/sbin/iwconfig blue0 channel 05
-                /usr/bin/hostapd -P /var/run/hostapd /etc/hostapd.conf &
-                evaluate_retval
-                ;;
+               mkdir -p /var/run/hostapd
+               if [ "$(/usr/sbin/iwconfig $INTERFACE | /bin/grep "Mode:Master")" == "" ]; then
+
+                   boot_mesg "Setting wlan $INTERFACE to Master mode... "
+
+                   # Set Atheros Cards to master mode
+                   if [ -d /proc/net/madwifi/ath0/ ]; then
+                       /usr/bin/wlanconfig ath0 destroy > /dev/null
+                   fi
+
+                   /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
+;;
 
         stop)
-                # Just make sure when going down the first time blue0 nw values are ignored
-               sed -i -e 's/^ACTION=="add", SUBSYSTEM=="net", SYSFS{address}=="*", NAME="blue0"*/#ACTION=="add", SUBSYSTEM=="net", SYSFS{address}=="*", NAME="blue0"*/' /etc/udev/rules.d/30-persistent-network.rules
-                /usr/local/bin/wlanconfig blue0 destroy
+               boot_mesg "Stopping hostapd..."
+
                 killproc /usr/bin/hostapd
                 evaluate_retval
                 ;;