1 files changed, 27 insertions, 20 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 169e567d..40d8e102 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,27 +10,34 @@
 #
 # stage3 init-hook 10 of 'wlanboot' plugin - firing up the wlan connection
 
-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}
+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 "  Unable to configure the WLAN interface."
-    fi
-  else
-    error "  No wireless LAN capable interface found. Did you provide the \
+      error "  No wireless LAN capable interface found. Did you provide the \
 proper kernel\n  modules and firmware?"
+    fi
+  fi	
+else
+  error "  No configuration file found for wlanboot plugin."
 fi