diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-04-09 17:36:58 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2012-04-10 11:00:18 -0700 |
| commit | b9cab256426396e3ba8fd86fd37ac15f0d90f324 (patch) | |
| tree | a74a1733eeb119d69d6af8dc565857414949828f | |
| parent | 0e75057ff27bb1ff803d031fc315d9656c16d515 (diff) | |
| download | panda-b9cab256426396e3ba8fd86fd37ac15f0d90f324.tar.gz | |
Organize external storage to enforce sdcard_r.
Create /storage/ to require that users have sdcard_r GID, and place
both emulated and real SD card mount points inside it. Also reduce
visibility of /data/media.
Bug: 6131916
Change-Id: I4975d4cdbe5296fbda87a8ca915e9777fa4e1299
| -rw-r--r-- | init.omap4pandaboard.rc | 14 | ||||
| -rw-r--r-- | overlay/frameworks/base/core/res/res/xml/storage_list.xml | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/init.omap4pandaboard.rc b/init.omap4pandaboard.rc index 928c4b9..125e0fe 100644 --- a/init.omap4pandaboard.rc +++ b/init.omap4pandaboard.rc @@ -1,14 +1,16 @@ import init.omap4pandaboard.usb.rc on early-init - export EXTERNAL_STORAGE /mnt/sdcard - mkdir /mnt/sdcard 0000 system system + export EXTERNAL_STORAGE /storage/sdcard0 + mkdir /storage 0550 system sdcard_r + mkdir /storage/sdcard0 0000 system system # for backwards compatibility - symlink /mnt/sdcard /sdcard + symlink /storage/sdcard0 /sdcard + symlink /storage/sdcard0 /mnt/sdcard on post-fs-data - # we will remap this as /mnt/sdcard with the sdcard fuse tool - mkdir /data/media 0775 media_rw media_rw + # 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 setprop vold.post_fs_data_done 1 mkdir /data/misc/dhcp 0770 dhcp dhcp @@ -46,7 +48,7 @@ service uim /system/bin/uim-sysfs user bluetooth group bluetooth net_bt_admin -# create virtual SD card at /mnt/sdcard, based on the /data/media directory +# 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 diff --git a/overlay/frameworks/base/core/res/res/xml/storage_list.xml b/overlay/frameworks/base/core/res/res/xml/storage_list.xml index 043530d..0a03928 100644 --- a/overlay/frameworks/base/core/res/res/xml/storage_list.xml +++ b/overlay/frameworks/base/core/res/res/xml/storage_list.xml @@ -33,7 +33,7 @@ --> <StorageList xmlns:android="http://schemas.android.com/apk/res/android"> - <storage android:mountPoint="/mnt/sdcard" + <storage android:mountPoint="/storage/sdcard0" android:storageDescription="@string/storage_internal" android:primary="true" android:emulated="true" |