From 71115483304b264959efa4791c138b7ccbcbb1cc Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Wed, 18 Feb 2009 17:34:53 +0000
Subject: Should have checked better (revoking parts of r2602).

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2603 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 .../init-hooks/10-nw-if-config/wlanboot.sh         | 48 +++++++++-------------
 1 file changed, 20 insertions(+), 28 deletions(-)

diff --git a/os-plugins/plugins/wlanboot/init-hooks/10-nw-if-config/wlanboot.sh b/os-plugins/plugins/wlanboot/init-hooks/10-nw-if-config/wlanboot.sh
index 40d8e102..2608ace1 100755
--- a/os-plugins/plugins/wlanboot/init-hooks/10-nw-if-config/wlanboot.sh
+++ b/os-plugins/plugins/wlanboot/init-hooks/10-nw-if-config/wlanboot.sh
@@ -10,34 +10,26 @@
 #
 # stage3 init-hook 10 of 'wlanboot' plugin - firing up the wlan connection
 
-if [ -e /initramfs/plugin-conf/wlanboot.conf ] ; then
-  . /initramfs/plugin-conf/wlanboot.conf
-
-  if [ $wlanboot_active -ne 0 ]; then
-    # get essid for WLAN boot
-    for source in /proc/cmdline /etc/initramfs-setup ; do
-      essid=$(grep essid $source)
-      if [ -n "$essid" ] ; then
-        essid=${essid#essid=}
-        break
-      fi
-    done
-    # do WLAN specific settings, definition of wlan interface name and wireless
-    # connect
-    wlanif=$(iwconfig 2>/dev/null|sed -n "/ESSID:/p"|sed "s/    .*//")
-    if [ -n "$if" ] ; then
-      ip link set dev ${wlanif} up
-      if iwconfig ${wlanif} mode managed essid "${essid}"; then
-        nwif=${wlanif}
-      else
-        error "  Unable to configure the WLAN interface."
-      fi
-    else
-      error "  No wireless LAN capable interface found. Did you provide the \
-proper kernel\n  modules and firmware?"
-    fi
-  fi	
+# get essid for WLAN boot
+for source in /proc/cmdline /etc/initramfs-setup ; do
+  essid=$(grep essid $source)
+  if [ -n "$essid" ] ; then
+    essid=${essid#essid=}
+    break
+  fi
+done
+# do WLAN specific settings, definition of wlan interface name and wireless
+# connect
+wlanif=$(iwconfig 2>/dev/null|sed -n "/ESSID:/p"|sed "s/    .*//")
+if [ -n "$if" ] ; then
+  ip link set dev ${wlanif} up
+  if iwconfig ${wlanif} mode managed essid "${essid}"; then
+    nwif=${wlanif}
+  else
+    error "  Unable to configure the WLAN interface."
+  fi
 else
-  error "  No configuration file found for wlanboot plugin."
+  error "  No wireless LAN capable interface found. Did you provide the \
+proper kernel\n  modules and firmware?"
 fi
 
-- 
cgit v1.2.3-55-g7522