[blfs-book] r11122 - trunk/bootscripts/blfs/services

krejzi at higgs.linuxfromscratch.org krejzi at higgs.linuxfromscratch.org
Sun Mar 24 08:39:14 PDT 2013


Author: krejzi
Date: Sun Mar 24 08:39:14 2013
New Revision: 11122

Log:
Add xinglp's changes to wpa service.

Modified:
   trunk/bootscripts/blfs/services/wpa

Modified: trunk/bootscripts/blfs/services/wpa
==============================================================================
--- trunk/bootscripts/blfs/services/wpa	Sun Mar 24 05:28:44 2013	(r11121)
+++ trunk/bootscripts/blfs/services/wpa	Sun Mar 24 08:39:14 2013	(r11122)
@@ -12,6 +12,7 @@
 . /lib/lsb/init-functions
 . $IFCONFIG
 
+CFGFILE=/etc/sysconfig/wpa_supplicant-${IFCONFIG##*.}.conf
 PIDFILE=/run/wpa_supplicant/$1.pid
 CONTROL_IFACE=/run/wpa_supplicant/$1
 
@@ -28,8 +29,8 @@
          fi
       fi
 
-      if [ ! -e /etc/sysconfig/wpa_supplicant-$1.conf ]; then
-        log_info_msg "\n wpa_supplicant configuration file not present"
+      if [ ! -e ${CFGFILE} ]; then
+        log_info_msg "\n wpa_supplicant configuration file ${CFGFILE} not present"
         log_failure_msg2
         exit 1
       fi
@@ -38,7 +39,7 @@
 
       mkdir -p /run/wpa_supplicant
 
-      /sbin/wpa_supplicant -q -B -Dnl80211,wext -P${PIDFILE} -C/run/wpa_supplicant -c/etc/sysconfig/wpa_supplicant-$1.conf -i$1 ${WPA_ARGS}
+      /sbin/wpa_supplicant -q -B -Dnl80211,wext -P${PIDFILE} -C/run/wpa_supplicant -c${CFGFILE} -i$1 ${WPA_ARGS}
 
       if [ "$?" != "0" ]; then
         log_failure_msg2



More information about the blfs-book mailing list