From b12a9b83e1e7abac5e1099977b098c1ba918f8c5 Mon Sep 17 00:00:00 2001
From: codeworkx <codeworkx@cyanogenmod.org>
Date: Sun, 28 Jul 2013 00:15:59 +0200
Subject: p51xx: unified fstab

Change-Id: I77f3d3c5409303e4af60c76b36859e05c6658472
---
 configs/vold.fstab       | 19 -------------------
 p51xx-common.mk          |  4 ----
 rootdir/fstab.espresso10 | 12 +++++++-----
 3 files changed, 7 insertions(+), 28 deletions(-)
 delete mode 100644 configs/vold.fstab

diff --git a/configs/vold.fstab b/configs/vold.fstab
deleted file mode 100644
index 5cd3ee9..0000000
--- a/configs/vold.fstab
+++ /dev/null
@@ -1,19 +0,0 @@
-## Vold 2.0 Generic fstab
-## - San Mehat (san@android.com)
-##
-
-#######################
-## Regular device mount
-##
-## Format: dev_mount <label> <mount_point> <part> <sysfs_path1...>
-## label        - Label for the volume
-## mount_point  - Where the volume will be mounted
-## part         - Partition # (1 based), or 'auto' for first usable partition.
-## <sysfs_path> - List of sysfs paths to source devices
-######################
-
-# external sdcard
-dev_mount sdcard1 /storage/sdcard1 auto /devices/platform/omap/omap_hsmmc.0/mmc_host/mmc1
-
-#usb host device 
-dev_mount usbdisk0 /storage/usbdisk0 auto /devices/platform/omap/musb-omap2430/musb-hdrc/usb1
diff --git a/p51xx-common.mk b/p51xx-common.mk
index 7ba6643..120f472 100755
--- a/p51xx-common.mk
+++ b/p51xx-common.mk
@@ -38,10 +38,6 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/rootdir/ueventd.espresso10.rc:root/ueventd.espresso10.rc \
     $(LOCAL_PATH)/rootdir/fstab.espresso10:root/fstab.espresso10
 
-# Vold
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/vold.fstab:system/etc/vold.fstab
-
 # Audio
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/audio_effects.conf:system/etc/audio_effects.conf
diff --git a/rootdir/fstab.espresso10 b/rootdir/fstab.espresso10
index a9e60d6..4ef6401 100644
--- a/rootdir/fstab.espresso10
+++ b/rootdir/fstab.espresso10
@@ -1,10 +1,12 @@
 # Android fstab file.
-#<src>                                                  <mnt_point>         <type>    <mnt_flags and options>                                                                   <fs_mgr_flags>
+#<src>                                                  <mnt_point>         <type>    <mnt_flags and options>                                                                  <fs_mgr_flags>
 # 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
-- 
cgit v1.1