diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-11-23 06:51:34 +0100 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-11-23 06:51:34 +0100 |
| commit | 45bc4b754b3a89d39caac8f9b58b14182c67ecf6 (patch) | |
| tree | 5c052d202b6c9ce9219b5c97167319677a9889f4 /init.tuna.rc | |
| parent | 8dc38ab89576751c794f2a8a675628f38718f246 (diff) | |
| parent | 214d003a47e7fe2962df667c5d65bce92a21a40e (diff) | |
| download | device_samsung_tuna-45bc4b754b3a89d39caac8f9b58b14182c67ecf6.zip device_samsung_tuna-45bc4b754b3a89d39caac8f9b58b14182c67ecf6.tar.gz device_samsung_tuna-45bc4b754b3a89d39caac8f9b58b14182c67ecf6.tar.bz2 | |
Merge remote-tracking branch 'remotes/google/jb-mr1-release' into HEAD
Conflicts:
audio/audio_hw.c
init.tuna.rc
overlay/frameworks/base/core/res/res/xml/storage_list.xml
recovery/Android.mk
Change-Id: I0b13c6b5e61ea709b0e9aaa1c7b798684b33873a
Diffstat (limited to 'init.tuna.rc')
| -rwxr-xr-x | init.tuna.rc | 49 |
1 files changed, 21 insertions, 28 deletions
diff --git a/init.tuna.rc b/init.tuna.rc index fcaceda..374e425 100755 --- a/init.tuna.rc +++ b/init.tuna.rc @@ -1,19 +1,23 @@ import init.tuna.usb.rc -on early-init - export EXTERNAL_STORAGE /storage/sdcard0 - mkdir /storage 0050 system sdcard_r - mkdir /storage/sdcard0 0000 system system - mkdir /storage/usbdisk 0755 system system - # for backwards compatibility - symlink /storage/sdcard0 /sdcard - symlink /storage/sdcard0 /mnt/sdcard - symlink /storage/usbdisk /mnt/usbdisk +on init + # See storage config details at http://source.android.com/tech/storage/ + mkdir /mnt/shell/emulated 0700 shell shell + mkdir /storage/emulated 0555 root root + + export EXTERNAL_STORAGE /storage/emulated/legacy + export EMULATED_STORAGE_SOURCE /mnt/shell/emulated + export EMULATED_STORAGE_TARGET /storage/emulated + + # Support legacy paths + symlink /storage/emulated/legacy /sdcard + symlink /storage/emulated/legacy /mnt/sdcard + symlink /storage/emulated/legacy /storage/sdcard0 + symlink /mnt/shell/emulated/0 /storage/emulated/legacy on post-fs-data - # we will remap this as /storage/sdcard0 with the sdcard fuse tool - mkdir /data/media 0770 media_rw media_rw - chown media_rw media_rw /data/media + mkdir /data/media 0770 media_rw media_rw + mkdir /data/misc/wifi 0770 wifi wifi mkdir /data/misc/wifi/sockets 0770 wifi wifi mkdir /data/misc/dhcp 0770 dhcp dhcp @@ -127,15 +131,6 @@ service fRom /system/bin/fRom \ class late_start oneshot -service hciattach /system/bin/brcm_patchram_plus --enable_hci --no2bytes --enable_lpm \ - --tosleep 50000 --baudrate 3000000 --use_baudrate_for_download --i2s=1,1,0,1 \ - --patchram /vendor/firmware/bcm4330.hcd /dev/ttyO1 - class main - user bluetooth - group bluetooth net_bt_admin - disabled - oneshot - service pvrsrvctl /vendor/bin/pvrsrvctl --start --no-module class core user root @@ -165,11 +160,9 @@ service smc_pa_wvdrm /system/bin/smc_pa_ctrl \ group drmrpc oneshot -# create virtual SD card at /storage/sdcard0, based on the /data/media directory -# daemon will drop to user/group system/media_rw after initializing -# underlying files in /data/media will be created with user and group media_rw (1023) -service sdcard /system/bin/sdcard /data/media 1023 1023 - class late_start +# virtual sdcard daemon running as media_rw (1023) +service sdcard /system/bin/sdcard /data/media /mnt/shell/emulated 1023 1023 + class late_start service p2p_supplicant /system/bin/wpa_supplicant \ -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf -N \ @@ -194,7 +187,7 @@ service wpa_supplicant /system/bin/wpa_supplicant \ disabled oneshot -service dhcpcd_wlan0 /system/bin/dhcpcd -aABKL +service dhcpcd_wlan0 /system/bin/dhcpcd -aABDKL class main disabled oneshot @@ -209,7 +202,7 @@ service dhcpcd_bnep0 /system/bin/dhcpcd -ABKL disabled oneshot -service dhcpcd_eth0 /system/bin/dhcpcd -ABKL +service dhcpcd_eth0 /system/bin/dhcpcd -ABDKL class main disabled oneshot |