aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xBoardConfig.mk2
-rwxr-xr-xrootdir/init.smdk4x12.rc27
2 files changed, 23 insertions, 6 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index f32e4e1..874f972 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -40,4 +40,4 @@ BOARD_RECOVERY_SWIPE_SWAPXY := true
-include vendor/samsung/n5100/BoardConfigVendor.mk
# assert
-TARGET_OTA_ASSERT_DEVICE := kona3gxx,n5100,GT-N5100,kona3g
+TARGET_OTA_ASSERT_DEVICE := GT-N5100,kona3g,n5100,kona3gxx
diff --git a/rootdir/init.smdk4x12.rc b/rootdir/init.smdk4x12.rc
index b284900..5d9628c 100755
--- a/rootdir/init.smdk4x12.rc
+++ b/rootdir/init.smdk4x12.rc
@@ -2,14 +2,16 @@ import init.smdk4x12.usb.rc
import init.bt.rc
on init
+ chmod 0701 /mnt/media_rw
mkdir /mnt/shell/emulated 0700 shell shell
mkdir /storage 0550 system sdcard_r
mkdir /storage/emulated 0555 root root
mkdir /storage/sdcard1 0775 system system
mkdir /storage/usbdisk0 0775 system system
+ mkdir /mnt/media_rw/sdcard1 0775 system system
+ mkdir /mnt/media_rw/usbdisk0 0775 system system
export EXTERNAL_STORAGE /storage/emulated/legacy
- export SECONDARY_STORAGE /storage/sdcard1
export EMULATED_STORAGE_SOURCE /mnt/shell/emulated
export EMULATED_STORAGE_TARGET /storage/emulated
@@ -491,13 +493,25 @@ service at_distributor /system/bin/at_distributor
# create virtual SD card at /mnt/sdcard, based on the /data/media directory
# daemon will drop to user/group system/media_rw after initializing
# underlying files in /data/media wil be created with user and group media_rw (1023)
-service sdcard /system/bin/sdcard /data/media /mnt/shell/emulated 1023 1023
+service sdcard /system/bin/sdcard -u 1023 -g 1023 -l /data/media /mnt/shell/emulated
class late_start
+service fuse_sdcard1 /system/bin/sdcard -u 1023 -g 1023 /mnt/media_rw/sdcard1 /storage/sdcard1
+ class late_start
+ disabled
+
+service fuse_usbdisk0 /system/bin/sdcard -u 1023 -g 1023 /mnt/media_rw/usbdisk0 /storage/usbdisk0
+ class late_start
+ 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
+ -I/system/etc/wifi/wpa_supplicant.conf \
+ -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
@@ -509,7 +523,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
+ -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