peregrine: Updated external storage configuration.

vold now manages external storage in a much more dynamic fashion,
so we no longer need to define FUSE daemons or mount points.

Bug: 19993667
Change-Id: If1ff24c62ee394afb02e223508aa5d768a3d041e
This commit is contained in:
Jeff Sharkey 2015-10-09 23:34:54 +02:00 committed by Gerrit Code Review
parent 4eee70b6c2
commit 0691554ef0
3 changed files with 2 additions and 71 deletions

View File

@ -1,54 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
**
** Copyright 2014, The CyanogenMod Project
**
** Licensed under the Apache License, Version 2.0 (the "License")
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<!-- The <device> element should contain one or more <storage> elements.
Exactly one of these should have the attribute primary="true".
This storage will be the primary external storage and should have mountPoint="/mnt/sdcard".
Each storage should have both a mountPoint and storageDescription attribute.
The following attributes are optional:
primary: this storage is the primary external storage
removable: this is removable storage (for example, a real SD card)
emulated: 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">
<storage android:storageDescription="@string/storage_internal"
android:emulated="true"
android:primary="true"
android:removable="false"
android:mtpReserve="100" />
<storage android:mountPoint="/storage/sdcard1"
android:storageDescription="@string/storage_sd_card"
android:removable="true"
android:maxFileSize="4096" />
<!-- external USB drive -->
<storage android:mountPoint="/storage/usbdisk"
android:storageDescription="@string/storage_usb"
android:removable="true" />
</StorageList>

View File

@ -11,6 +11,6 @@
/dev/block/platform/msm_sdcc.1/by-name/boot /boot emmc defaults recoveryonly
/dev/block/platform/msm_sdcc.1/by-name/recovery /recovery emmc defaults recoveryonly
/devices/msm_sdcc.2/mmc_host auto auto defaults voldmanaged=sdcard1:auto,migrate=target,noemulatedsd
/devices/platform/msm_hsusb_host auto auto defaults voldmanaged=usbdisk:auto
/devices/msm_sdcc.2/mmc_host* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
/devices/platform/msm_hsusb_host/usb* auto auto defaults voldmanaged=usb:auto
/dev/block/zram0 none swap defaults zramsize=268435456

View File

@ -26,17 +26,6 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
on init
# External storage directories
mkdir /mnt/media_rw/sdcard1 0700 media_rw media_rw
mkdir /storage/sdcard1 0700 root root
export SECONDARY_STORAGE /storage/sdcard1
# Support legacy paths
symlink /storage/sdcard1 /mnt/sdcard1
symlink /storage/sdcard1 /external_sd
on boot
# AK9863 Magnetometer
chown compass compass /sys/class/compass/akm8963/enable_acc
@ -63,7 +52,3 @@ service akmd8963 /system/bin/akmd8963
class main
user compass
group compass misc input
service fuse_sdcard1 /system/bin/sdcard -u 1023 -g 1023 -d /mnt/media_rw/sdcard1 /storage/sdcard1
class late_start
disabled