summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcodeworkx <codeworkx@cyanogenmod.org>2013-08-04 17:03:01 +0200
committercodeworkx <codeworkx@cyanogenmod.org>2013-08-06 01:47:36 +0200
commit4d96ddd2e3b4d0a40fa8d72a04baaf18de7037c3 (patch)
tree0868226ed7a214358086fd44baace946a762374f
parente208da1a4817c25f37ecb463e9d2aeae88e4b0d6 (diff)
downloaddevice_samsung_i9300-4d96ddd2e3b4d0a40fa8d72a04baaf18de7037c3.zip
device_samsung_i9300-4d96ddd2e3b4d0a40fa8d72a04baaf18de7037c3.tar.gz
device_samsung_i9300-4d96ddd2e3b4d0a40fa8d72a04baaf18de7037c3.tar.bz2
i9300: recovery: use unified fstab
Change-Id: I7a988021082955175fefd2fd62ab72f2385f688d
-rw-r--r--BoardConfig.mk4
-rw-r--r--recovery.fstab12
-rw-r--r--rootdir/fstab.smdk4x1221
-rwxr-xr-xrootdir/init.smdk4x12.rc1
4 files changed, 19 insertions, 19 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 04aaeb8..594770a 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -31,6 +31,10 @@ BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/samsung/i9300/bluetooth
TARGET_KERNEL_SOURCE := kernel/samsung/smdk4412
TARGET_KERNEL_CONFIG := cyanogenmod_i9300_defconfig
+# Recovery
+TARGET_RECOVERY_FSTAB := device/samsung/i9300/rootdir/fstab.smdk4x12
+RECOVERY_FSTAB_VERSION := 2
+
# assert
TARGET_OTA_ASSERT_DEVICE := m0,i9300,GT-I9300
diff --git a/recovery.fstab b/recovery.fstab
deleted file mode 100644
index 63ab14c..0000000
--- a/recovery.fstab
+++ /dev/null
@@ -1,12 +0,0 @@
-# mount point fstype device
-/efs ext4 /dev/block/mmcblk0p3
-/boot emmc /dev/block/mmcblk0p5
-/recovery emmc /dev/block/mmcblk0p6
-/cache ext4 /dev/block/mmcblk0p8
-/system ext4 /dev/block/mmcblk0p9
-/data ext4 /dev/block/mmcblk0p12 length=-16384
-/preload ext4 /dev/block/mmcblk0p10
-/modem emmc /dev/block/mmcblk0p7
-
-/sdcard datamedia /dev/null
-/external_sd auto /dev/block/mmcblk1p1 /dev/block/mmcblk1
diff --git a/rootdir/fstab.smdk4x12 b/rootdir/fstab.smdk4x12
index 4560bb1..f20de91 100644
--- a/rootdir/fstab.smdk4x12
+++ b/rootdir/fstab.smdk4x12
@@ -1,12 +1,19 @@
# 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/mmcblk0p3 /efs ext4 noatime,nosuid,nodev,journal_async_commit,errors=panic wait
-/dev/block/mmcblk0p9 /system ext4 ro,noatime wait
-/dev/block/mmcblk0p8 /cache ext4 noatime,nosuid,nodev,journal_async_commit,errors=panic wait
-/dev/block/mmcblk0p12 /data ext4 noatime,nosuid,nodev,discard,noauto_da_alloc,journal_async_commit,errors=panic wait,check,encryptable=footer
+/dev/block/mmcblk0p3 /efs ext4 noatime,nosuid,nodev,journal_async_commit,errors=panic wait
+/dev/block/mmcblk0p9 /system ext4 ro,noatime wait
+/dev/block/mmcblk0p8 /cache ext4 noatime,nosuid,nodev,journal_async_commit,errors=panic wait
+/dev/block/mmcblk0p10 /preload ext4 noatime,nosuid,nodev,journal_async_commit wait
+/dev/block/mmcblk0p12 /data ext4 noatime,nosuid,nodev,discard,noauto_da_alloc,journal_async_commit,errors=panic wait,check,encryptable=footer
# vold-managed volumes ("block device" is actually a sysfs devpath)
-/devices/platform/s3c-sdhci.2/mmc_host/mmc1 /storage/sdcard1 auto defaults voldmanaged=sdcard1:auto
-/devices/platform/s5p-ehci /storage/usbdisk0 auto defaults voldmanaged=usbdisk0:auto
+/devices/platform/s3c-sdhci.2/mmc_host/mmc1 /storage/sdcard1 auto defaults voldmanaged=sdcard1:auto
+/devices/platform/s5p-ehci /storage/usbdisk0 auto defaults voldmanaged=usbdisk0:auto
+
+# recovery
+/dev/block/mmcblk0p5 /boot emmc defaults recoveryonly
+/dev/block/mmcblk0p6 /recovery emmc defaults recoveryonly
+/dev/block/mmcblk0p7 /modem emmc defaults recoveryonly
+/dev/block/mmcblk1p1 /external_sd auto defaults recoveryonly
diff --git a/rootdir/init.smdk4x12.rc b/rootdir/init.smdk4x12.rc
index 4914fa2..93f4f97 100755
--- a/rootdir/init.smdk4x12.rc
+++ b/rootdir/init.smdk4x12.rc
@@ -28,6 +28,7 @@ on init
insmod /system/lib/modules/Si4709_driver.ko
on fs
+ mkdir /preload
mount_all /fstab.smdk4x12
setprop ro.crypto.fuse_sdcard true