Skip to content

Commit

Permalink
flounder: Get rid of recovery-only fstab
Browse files Browse the repository at this point in the history
 * Mounting /system and /vendor partitions is handled in kernel now,
   however removing the entries from fstab caused issues building
   the OTA. The workaround was to have a separate fstab, but turns out
   that simply setting the recoveryonly flag does the trick because
   those are then ignored during a normal Android boot.

Change-Id: I2944384d0a1c41bc9f9f51e2e29daff2bed0a0f4
  • Loading branch information
mikeNG authored and bgcngm committed Mar 1, 2018
1 parent 8d77999 commit 096e367
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 20 deletions.
2 changes: 1 addition & 1 deletion BoardConfig.mk
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ USE_OPENGL_RENDERER := true
NUM_FRAMEBUFFER_SURFACE_BUFFERS := 2
BOARD_DISABLE_TRIPLE_BUFFERED_DISPLAY_SURFACES := true

TARGET_RECOVERY_FSTAB := device/htc/flounder/fstab.full
TARGET_RECOVERY_FSTAB := device/htc/flounder/fstab.flounder
TARGET_RECOVERY_PIXEL_FORMAT := RGBX_8888

TARGET_USERIMAGES_USE_EXT4 := true
Expand Down
4 changes: 3 additions & 1 deletion fstab.flounder
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
# The filesystem that contains the filesystem e2fsck binary (typically /system) cannot
# specify 'check', and must come before any filesystems that do specify 'check'

# NOTE: /system and /vendor partitions are now early-mounted and the fstab entries are specified in device tree:
# NOTE: /system and /vendor partitions are now early-mounted and the fstab entries are specified in device tree (duplicated below for recovery image purposes only):
# /proc/device-tree/firmware/android/fstab/system
# /proc/device-tree/firmware/android/fstab/vendor

#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
/dev/block/platform/sdhci-tegra.3/by-name/APP /system ext4 ro wait,recoveryonly
/dev/block/platform/sdhci-tegra.3/by-name/VNR /vendor ext4 ro wait,recoveryonly
/dev/block/platform/sdhci-tegra.3/by-name/CAC /cache f2fs noatime,nosuid,nodev,errors=panic wait,check
/dev/block/platform/sdhci-tegra.3/by-name/CAC /cache ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait,check
/dev/block/platform/sdhci-tegra.3/by-name/UDA /data f2fs noatime,nosuid,nodev,errors=panic wait,check,latemount,forceencrypt=/dev/block/platform/sdhci-tegra.3/by-name/MD1
Expand Down
18 changes: 0 additions & 18 deletions fstab.full

This file was deleted.

0 comments on commit 096e367

Please sign in to comment.