Permalink
Browse files

Revert "add mount point for internal storage"

This reverts commit 016d926.
This partially reverts commit 492b24d

Change-Id: Ib9368dcccd253d563a9998205ecc5a4fe7ab01e1
  • Loading branch information...
1 parent 0d733d2 commit a43d7b12542ff9aac92c454ba80ac4bd403844c1 @KonstaT committed Apr 22, 2013
@@ -28,23 +28,14 @@
emulated: (boolean) the storage is emulated via the FUSE sdcard daemon
mtpReserve: (integer) number of megabytes of storage MTP should reserve for free storage
(used for emulated storage that is shared with system's data partition)
- allowMassStorage: (boolean) true if this volume can be shared via USB mass storage
- maxFileSize: (integer) maximum file size in megabytes
A storage should not have both emulated and removable set to true
-->
<StorageList xmlns:android="http://schemas.android.com/apk/res/android">
- <!-- internal emulated storage -->
<storage android:mountPoint="/storage/sdcard0"
- android:storageDescription="@string/storage_internal"
- android:primary="true"
- android:emulated="true"
- android:mtpReserve="100" />
- <!-- external SD card -->
- <storage android:mountPoint="/storage/sdcard1"
- android:storageDescription="@string/storage_sd_card"
- android:removable="true"
- android:allowMassStorage="true"
- android:maxFileSize="4096" />
+ android:storageDescription="@string/storage_sd_card"
+ android:primary="true"
+ android:removable="true"
+ android:allowMassStorage="true" />
</StorageList>
@@ -25,4 +25,4 @@
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-dev_mount sdcard /storage/sdcard1 auto /devices/platform/msm_sdcc.1/mmc_host
+dev_mount sdcard /storage/sdcard0 auto /devices/platform/msm_sdcc.1/mmc_host
View
@@ -4,23 +4,12 @@ on early-init
mount debugfs debugfs /sys/kernel/debug
on init
- mkdir /mnt/shell/emulated 0700 shell shell
- mkdir /storage 0550 system sdcard_r
- mkdir /storage/emulated 0555 root root
- mkdir /storage/sdcard1 0000 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
-
- # Support legacy paths
- symlink /storage/emulated/legacy /sd-internal
- symlink /storage/emulated/legacy /mnt/sd-internal
- symlink /storage/emulated/legacy /storage/sdcard0
- symlink /mnt/shell/emulated/0 /storage/emulated/legacy
- symlink /storage/sdcard1 /sdcard
- symlink /storage/sdcard1 /mnt/sdcard
+ mkdir /storage 0775 system sdcard_r
+ mkdir /storage/sdcard0 0000 system system
+ export EXTERNAL_STORAGE /storage/sdcard0
+ # for backwards compatibility
+ symlink /storage/sdcard0 /mnt/sdcard
+ symlink /storage/sdcard0 /sdcard
on fs
# mount mmc partitions
@@ -48,9 +37,6 @@ on post-fs-data
mkdir /data/wpstiles/ 0755 shell
mkdir /data/wiper 0775 gps qcom_oncrpc
- mkdir /data/media 0770 media_rw media_rw
- chown media_rw media_rw /data/media
-
chmod 0664 /sys/devices/platform/msm_sdcc.1/polling
chmod 0664 /sys/devices/platform/msm_sdcc.2/polling
chmod 0664 /sys/devices/platform/msm_sdcc.3/polling
@@ -248,6 +234,3 @@ service akmd /system/bin/akmd8962_new -m 5
class main
oneshot
-service sdcard /system/bin/sdcard /data/media /mnt/shell/emulated 1023 1023
- class late_start
-
View
@@ -7,7 +7,6 @@
/cache ext4 /dev/block/mmcblk0p21
/data ext4 /dev/block/mmcblk0p22
-/sdcard datamedia /dev/null
-/external_sd vfat /dev/block/mmcblk1p1 /dev/block/mmcblk1
+/sdcard vfat /dev/block/mmcblk1p1 /dev/block/mmcblk1
/sd-ext auto /dev/block/mmcblk1p2

0 comments on commit a43d7b1

Please sign in to comment.