diff options
| author | codeworkx <codeworkx@cyanogenmod.org> | 2013-08-04 17:18:02 +0200 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.org> | 2013-08-04 17:18:02 +0200 |
| commit | 935429677834d4657e5d23356a688ffdabb58702 (patch) | |
| tree | 4bed631a8002d25f7475b26c884b2f0f398f363b | |
| parent | b12a9b83e1e7abac5e1099977b098c1ba918f8c5 (diff) | |
| download | device_samsung_espresso3g-935429677834d4657e5d23356a688ffdabb58702.zip device_samsung_espresso3g-935429677834d4657e5d23356a688ffdabb58702.tar.gz device_samsung_espresso3g-935429677834d4657e5d23356a688ffdabb58702.tar.bz2 | |
p5100: recovery: use unified fstab
Change-Id: Icbd14e660ab75627204c66693b1869475ba9c652
| -rw-r--r-- | BoardConfigCommon.mk | 2 | ||||
| -rw-r--r-- | recovery.fstab | 15 | ||||
| -rw-r--r-- | rootdir/fstab.espresso10 | 18 |
3 files changed, 14 insertions, 21 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 901fb78..755d3b6 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -96,6 +96,8 @@ BOARD_UMS_LUNFILE := "/sys/class/android_usb/f_mass_storage/lun0/file" BOARD_USES_MMCUTILS := true BOARD_HAS_NO_MISC_PARTITION := true BOARD_HAS_NO_SELECT_BUTTON := true +TARGET_RECOVERY_FSTAB := device/samsung/p5100/rootdir/fstab.espresso10 +RECOVERY_FSTAB_VERSION := 2 # Charging mode BOARD_CHARGER_RES := device/samsung/p5100/res/charger diff --git a/recovery.fstab b/recovery.fstab deleted file mode 100644 index f4e3df0..0000000 --- a/recovery.fstab +++ /dev/null @@ -1,15 +0,0 @@ -# mount point fstype device - -/system ext4 /dev/block/mmcblk0p9 -/cache ext4 /dev/block/mmcblk0p7 -/data ext4 /dev/block/mmcblk0p10 length=-16384 -/efs ext4 /dev/block/mmcblk0p1 -/misc emmc misc -/boot emmc /dev/block/mmcblk0p5 -/recovery emmc /dev/block/mmcblk0p6 -/bootloader emmc /dev/block/mmcblk0p2 -/modem emmc /dev/block/mmcblk0p8 -/preload ext4 /dev/block/mmcblk0p11 - -/sdcard datamedia /dev/null -/external_sd auto /dev/block/mmcblk1p1 /dev/block/mmcblk1 diff --git a/rootdir/fstab.espresso10 b/rootdir/fstab.espresso10 index 4ef6401..203689d 100644 --- a/rootdir/fstab.espresso10 +++ b/rootdir/fstab.espresso10 @@ -3,10 +3,16 @@ # The filesystem that contains the filesystem checker binary (typically /system) cannot # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK -/dev/block/platform/omap/omap_hsmmc.1/by-name/FACTORYFS /system ext4 ro,barrier=1 wait -/dev/block/platform/omap/omap_hsmmc.1/by-name/EFS /efs ext4 nosuid,nodev,barrier=1 wait,check -/dev/block/platform/omap/omap_hsmmc.1/by-name/DATAFS /data ext4 noatime,nosuid,nodev,barrier=1,discard,noauto_da_alloc,journal_async_commit wait,check,encryptable=footer -/dev/block/platform/omap/omap_hsmmc.1/by-name/CACHE /cache ext4 noatime,nosuid,nodev,barrier=1,discard,noauto_da_alloc,journal_async_commit wait,check +/dev/block/platform/omap/omap_hsmmc.1/by-name/FACTORYFS /system ext4 ro,barrier=1 wait +/dev/block/platform/omap/omap_hsmmc.1/by-name/EFS /efs ext4 nosuid,nodev,barrier=1 wait,check +/dev/block/platform/omap/omap_hsmmc.1/by-name/DATAFS /data ext4 noatime,nosuid,nodev,barrier=1,discard,noauto_da_alloc,journal_async_commit wait,check,encryptable=footer +/dev/block/platform/omap/omap_hsmmc.1/by-name/CACHE /cache ext4 noatime,nosuid,nodev,barrier=1,discard,noauto_da_alloc,journal_async_commit wait,check -/devices/platform/omap/omap_hsmmc.0/mmc_host/mmc1 /storage/sdcard1 auto defaults voldmanaged=sdcard1:auto -/devices/platform/omap/musb-omap2430/musb-hdrc/usb1 /storage/usbdisk0 auto defaults voldmanaged=usbdisk0:auto +# vold-managed volumes ("block device" is actually a sysfs devpath) +/devices/platform/omap/omap_hsmmc.0/mmc_host/mmc1 /storage/sdcard1 auto defaults voldmanaged=sdcard1:auto +/devices/platform/omap/musb-omap2430/musb-hdrc/usb1 /storage/usbdisk0 auto defaults voldmanaged=usbdisk0:auto + +# recovery +/dev/block/mmcblk0p5 /boot emmc defaults recoveryonly +/dev/block/mmcblk0p6 /recovery emmc defaults recoveryonly +/dev/block/mmcblk1p1 /external_sd auto defaults recoveryonly |