aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcodeworkx <codeworkx@cyanogenmod.org>2013-07-28 00:55:27 +0200
committercodeworkx <codeworkx@cyanogenmod.org>2013-07-28 00:55:27 +0200
commit8e828861c9afe3fa0b36e1b3401fef9479992921 (patch)
tree04999e1dfdbcc781428cc8a0e02c83bc2ede70e4
parentbcd0287b1df68629d4d239b0453d96185b5c4302 (diff)
downloaddevice_samsung_espressowifi-8e828861c9afe3fa0b36e1b3401fef9479992921.zip
device_samsung_espressowifi-8e828861c9afe3fa0b36e1b3401fef9479992921.tar.gz
device_samsung_espressowifi-8e828861c9afe3fa0b36e1b3401fef9479992921.tar.bz2
p31xx: unified fstab
Change-Id: I43ab968788b897d79df2a7ce4d07ff56567ba4e9
-rw-r--r--configs/vold.fstab19
-rwxr-xr-xp31xx-common.mk4
-rw-r--r--rootdir/fstab.espresso12
3 files changed, 7 insertions, 28 deletions
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/p31xx-common.mk b/p31xx-common.mk
index d5787fb..e491693 100755
--- a/p31xx-common.mk
+++ b/p31xx-common.mk
@@ -38,10 +38,6 @@ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/rootdir/ueventd.espresso.rc:root/ueventd.espresso.rc \
$(LOCAL_PATH)/rootdir/fstab.espresso:root/fstab.espresso
-# 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.espresso b/rootdir/fstab.espresso
index 47a3ffc..4ef6401 100644
--- a/rootdir/fstab.espresso
+++ b/rootdir/fstab.espresso
@@ -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 \ No newline at end of file
+/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