[Initng-svn] r2338 - initng/initfiles/daemon

[svn at initng.thinktux.net]

Author: jimmy
Date: Mon Dec  5 22:51:10 2005
New Revision: 2338

Modified:
   initng/initfiles/daemon/wpa_supplicant.ii
Log:
Update wpa_supplicant from bug 301


Modified: initng/initfiles/daemon/wpa_supplicant.ii
==============================================================================
--- initng/initfiles/daemon/wpa_supplicant.ii	(original)
+++ initng/initfiles/daemon/wpa_supplicant.ii	Mon Dec  5 22:51:10 2005
@@ -1,28 +1,31 @@
 daemon daemon/wpa_supplicant/* {
-	need = system/mountfs;
-	pid_file = /var/run/wpa_supplicant-${NAME}.pid;
-	env_parse = /etc/initng/net/scripts/functions;
+        need = system/mountfs
+        pid_file = /var/run/wpa_supplicant-${NAME}.pid
     
-	script daemon = {
-		eval opts=\"\$\{wpa_supplicant_${ifvar}\} -i${iface} -c/etc/wpa_supplicant.conf -B\"
-		[[ -f /usr/sbin/wpa_cli.action ]] \
-			&& opts="${opts} -W -P/var/run/wpa_supplicant-${iface}.pid"
-		@/usr/sbin/wpa_supplicant@ ${opts}
-		
-		if [[ -f /usr/sbin/wpa_cli.action ]]; then
-			@ngc@ -u daemon/wpa_cli/${iface}
-			exit 0
-		fi
+        daemon  {
+         
+                . /lib/initng/scripts/net/functions
+                eval opts=\"\$\{wpa_supplicant_${ifvar}\} -i${iface}
+-c/etc/wpa_supplicant.conf -B\"
+                [[ -f /sbin/wpa_cli.action ]] \
+                        && opts="${opts} -W -P/var/run/wpa_supplicant-${iface}.pid"
+                /sbin/wpa_supplicant ${opts}
+                
+                if [[ -f /sbin/wpa_cli.action ]]; then
+                        /sbin/ngc -u daemon/wpa_cli/${iface}
+                        exit 0
+                fi
 
-		source "${libdir}/wpa_supplicant"
-		if ! wpa_supplicant_associate ; then
-			@wpa_cli@ -i${iface} terminate
-			exit 1
-		fi
+                source "${libdir}/wpa_supplicant"
+                if ! wpa_supplicant_associate ; then
+                        /bin/wpa_cli -i${iface} terminate
+                        exit 1
+                fi
 
-		@ngc@ -u net/${iface}
-	}
-	script stop = {
-		@pkill@ -f "/usr/sbin/wpa_supplicant .* -i${NAME} "
-	}
+                /sbin/ngc -u net/${iface} 
+                
+        }
+        kill {
+                /usr/bin/pkill -f "/sbin/wpa_supplicant .* -i${NAME} "
+        }
 }