ramdisk: support both f2fs and ext4 (cache and data only)

* move /data out of fstab/mount_all so failed mount attempts still allow init to continue
imoseyon · Nov 14, 2014 · 38290b5 · 38290b5
1 parent 8ba89a7
commit 38290b5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lk.ramdisk/fstab.qcom b/lk.ramdisk/fstab.qcom
@@ -7,7 +7,7 @@
 
 #<src>                                                <mnt_point>  <type>  <mnt_flags and options>                     <fs_mgr_flags>
 /dev/block/platform/msm_sdcc.1/by-name/system         /system      ext4    ro,errors=panic                                wait
-/dev/block/platform/msm_sdcc.1/by-name/userdata       /data        ext4    nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic      wait,check,encryptable=footer
+#/dev/block/platform/msm_sdcc.1/by-name/userdata       /data        ext4    nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic      wait,check,encryptable=footer
 
 # VOLD
 /devices/msm_sdcc.3/mmc_host/mmc2,/devices/msm_sdcc.2/mmc_host/mmc1,/devices/msm_sdcc.2/mmc_host/mmc2			auto 					vfat	default		voldmanaged=extSdCard:auto,noemulatedsd

diff --git a/lk.ramdisk/init.target.rc b/lk.ramdisk/init.target.rc
@@ -51,9 +51,12 @@ on fs
     # these partition flashed on the device. Failure to mount any partition in fstab file
     # results in failure to launch late-start class.
 
+    mount ext4 /dev/block/platform/msm_sdcc.1/by-name/userdata /data nosuid nodev noatime noauto_da_alloc,discard,journal_async_commit
+    mount f2fs /dev/block/platform/msm_sdcc.1/by-name/userdata /data noatime nosuid nodev discard,inline_xattr
     wait /dev/block/platform/msm_sdcc.1/by-name/cache
     check_fs /dev/block/platform/msm_sdcc.1/by-name/cache ext4
-    mount ext4 /dev/block/platform/msm_sdcc.1/by-name/cache /cache nosuid nodev noatime noauto_da_alloc,discard,journal_async_commit,errors=panic
+    mount ext4 /dev/block/platform/msm_sdcc.1/by-name/cache /cache nosuid nodev noatime noauto_da_alloc,discard,journal_async_commit
+    mount f2fs /dev/block/platform/msm_sdcc.1/by-name/cache /cache noatime nosuid nodev discard,inline_xattr
 
     wait /dev/block/platform/msm_sdcc.1/by-name/persist
     check_fs /dev/block/platform/msm_sdcc.1/by-name/persist ext4