Blob Blame History Raw
diff -up wifi-radar-2.0.s06/wifi-radar.orig wifi-radar-2.0.s06/wifi-radar
--- wifi-radar-2.0.s06/wifi-radar.orig	2009-11-22 03:29:24.015422420 +0100
+++ wifi-radar-2.0.s06/wifi-radar	2009-11-22 13:47:26.458418870 +0100
@@ -2914,15 +2914,15 @@ config_defaults = { # The network interf
 					'version': WIFI_RADAR_VERSION }
 
 config_dhcp = { # DHCP client
-				'command': '/sbin/dhcpcd',
+				'command': '/sbin/dhclient',
 				# How long to wait for an IP addr from DHCP server
 				'timeout': '30',
 				# Arguments to use with DHCP client on connect
-				'args': '-D -o -i dhcp_client -t %(timeout)s',
+				'args': '-timeout %(timeout)s %(interface)s',
 				# Argument to use with DHCP client on disconnect
-				'kill_args': '-k',
+				'kill_args': '-x',
 				# The file where DHCP client PID is written
-				'pidfile': '/etc/dhcpc/dhcpcd-%(interface)s.pid' }
+				'pidfile': '/var/run/dhclient.pid' }
 
 config_wpa = {  # WPA Supplicant
 				'command': '/usr/sbin/wpa_supplicant',
@@ -2931,7 +2931,7 @@ config_wpa = {  # WPA Supplicant
 				# Arguments to use with WPA Supplicant on disconnect
 				'kill_command': '',
 				# Where the WPA Supplicant config file can be found
-				'configuration': '/etc/wpa_supplicant.conf',
+				'configuration': '/etc/wpa_supplicant/wpa_supplicant.conf',
 				# Driver to use with WPA Supplicant
 				'driver': 'wext',
 				# The file where WPA Supplicant PID is written