summaryrefslogtreecommitdiffstats
path: root/rootdir
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-12-21 00:57:13 +0000
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-12-21 00:57:13 +0000
commitfa7f881998333debfa6dc5494d586f33ba92086f (patch)
tree66e0a32f23e597843398c18d20bebf58af4c1c99 /rootdir
parent21f4cdd9c1fe200d1c5ff1f7ee840ce289ef82c8 (diff)
parent446ad36801b3c2590964b9ac84411c6f88910fc2 (diff)
downloaddevice_samsung_smdk4412-common-fa7f881998333debfa6dc5494d586f33ba92086f.zip
device_samsung_smdk4412-common-fa7f881998333debfa6dc5494d586f33ba92086f.tar.gz
device_samsung_smdk4412-common-fa7f881998333debfa6dc5494d586f33ba92086f.tar.bz2
Merge "init: Update wpa_supplicant service parameters" into cm-11.0
Diffstat (limited to 'rootdir')
-rwxr-xr-xrootdir/init.smdk4x12.rc12
1 files changed, 9 insertions, 3 deletions
diff --git a/rootdir/init.smdk4x12.rc b/rootdir/init.smdk4x12.rc
index 8f9b6b1..986c25e 100755
--- a/rootdir/init.smdk4x12.rc
+++ b/rootdir/init.smdk4x12.rc
@@ -448,9 +448,12 @@ service fuse_usbdisk0 /system/bin/sdcard -u 1023 -g 1023 /mnt/media_rw/usbdisk0
disabled
service p2p_supplicant /system/bin/wpa_supplicant \
- -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf -N \
+ -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
+ -I/system/etc/wifi/wpa_supplicant.conf \
+ -O/data/misc/wifi/sockets -N \
-ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf -e/data/misc/wifi/entropy.bin \
- -puse_p2p_group_interface=1 -O/data/misc/wifi/sockets -g@android:wpa_wlan0
+ -puse_p2p_group_interface=1 \
+ -g@android:wpa_wlan0
# we will start as root and wpa_supplicant will switch to user wifi
# after setting up the capabilities required for WEXT
# user wifi
@@ -462,7 +465,10 @@ service p2p_supplicant /system/bin/wpa_supplicant \
service wpa_supplicant /system/bin/wpa_supplicant \
-Dnl80211 -iwlan0 -e/data/misc/wifi/entropy.bin \
- -c/data/misc/wifi/wpa_supplicant.conf -O/data/misc/wifi/sockets -g@android:wpa_wlan0
+ -c/data/misc/wifi/wpa_supplicant.conf \
+ -I/system/etc/wifi/wpa_supplicant.conf \
+ -O/data/misc/wifi/sockets \
+ -g@android:wpa_wlan0
# we will start as root and wpa_supplicant will switch to user wifi
# after setting up the capabilities required for WEXT
# user wifi