diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2013-04-26 16:59:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-26 16:59:17 +0000 |
| commit | d8ce51f24b7dcab8496db4da86892b338f24a8d7 (patch) | |
| tree | 5ddf39d093102ca32f1f077b0a1aba4da1cdfed0 | |
| parent | 9d338f8d58597ca8f1eae05c27c09be2b72f5225 (diff) | |
| parent | 9246cd034b85642031fac73f61e3007f292bd346 (diff) | |
| download | grouper-d8ce51f24b7dcab8496db4da86892b338f24a8d7.tar.gz | |
Merge "grouper: wlan: Add wpa_supplicant overlay file support" into jb-mr2-dev
| -rw-r--r-- | init.grouper.rc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/init.grouper.rc b/init.grouper.rc index 72ad1e6..aa1cbbd 100644 --- a/init.grouper.rc +++ b/init.grouper.rc @@ -288,7 +288,9 @@ on boot start touch_fw_update service wpa_supplicant /system/bin/wpa_supplicant \ - -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf -e/data/misc/wifi/entropy.bin + -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \ + -I/system/etc/wifi/wpa_supplicant_overlay.conf \ + -e/data/misc/wifi/entropy.bin # we will start as root and wpa_supplicant will switch to user wifi # after setting up the capabilities required for WEXT # user wifi @@ -299,8 +301,11 @@ service wpa_supplicant /system/bin/wpa_supplicant \ oneshot service p2p_supplicant /system/bin/wpa_supplicant \ - -iwlan0 -Dnl80211 -iwlan0 -c/data/misc/wifi/wpa_supplicant.conf -N \ - -ip2p0 -Dnl80211 -c /data/misc/wifi/p2p_supplicant.conf -e/data/misc/wifi/entropy.bin -puse_p2p_group_interface=1 + -iwlan0 -Dnl80211 -iwlan0 -c/data/misc/wifi/wpa_supplicant.conf \ + -I/system/etc/wifi/wpa_supplicant_overlay.conf -N \ + -ip2p0 -Dnl80211 -c /data/misc/wifi/p2p_supplicant.conf \ + -I/system/etc/wifi/wpa_supplicant_overlay.conf \ + -e/data/misc/wifi/entropy.bin -puse_p2p_group_interface=1 # we will start as root and wpa_supplicant will switch to user wifi # after setting up the capabilities required for WEXT # user wifi |