Mount /system from /bootloader/system.img

This commit is contained in:
Kamil Trzcinski 2016-12-17 16:15:32 +01:00
parent 7ccf3192da
commit 507d861eaf
4 changed files with 23 additions and 15 deletions

View file

@ -19,9 +19,16 @@ POLICYVERS := 28
INSTALLED_KERNEL_TARGET := kernel
BOARD_KERNEL_CMDLINE :=
TARGET_USERIMAGES_USE_EXT4 := true
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
BOARD_FLASH_BLOCK_SIZE := 4096
BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_CACHEIMAGE_PARTITION_SIZE := 805306368
BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_USERDATAIMAGE_PARTITION_SIZE := 1073741824
# Enable dex-preoptimization to speed up first boot sequence

View file

@ -1,7 +1,5 @@
/dev/block/mmcblk0p1 /bootloader vfat ro wait
/dev/block/mmcblk0p2 /system ext4 ro,barrier=1 wait
/dev/block/mmcblk0p3 /cache ext4 noatime,nosuid,nodev,barrier=1,data=ordered,nomblk_io_submit,noauto_da_alloc,errors=panic wait,check
/dev/block/mmcblk0p4 /data ext4 noatime,nosuid,nodev,barrier=1,data=ordered,nomblk_io_submit,noauto_da_alloc,errors=panic wait,check
/dev/block/mmcblk0p2 /cache ext4 noatime,nosuid,nodev,barrier=1,data=ordered,nomblk_io_submit,noauto_da_alloc,errors=panic wait,check
/dev/block/mmcblk0p3 /data ext4 noatime,nosuid,nodev,barrier=1,data=ordered,nomblk_io_submit,noauto_da_alloc,errors=panic wait,check
/devices/soc.0/1c10000.sdmmc/mmc_host/mmc* auto auto defaults voldmanaged=sdcard1:auto
/devices/soc.0/1c1a000.ehci0-controller/usb* auto auto defaults voldmanaged=usb:auto

View file

@ -22,13 +22,15 @@ on early-fs
exec u:r:su:s0 root -- /sbin/busybox sh /initialize_disk.sh
# mount boot and system
# it has to be here as mount_all does not support loopback
mount vfat /dev/block/mmcblk0p1 /bootloader rw wait
mount ext4 loop@/bootloader/system.img /system rw wait barrier=1
mount_all /fstab.sun50iw1p1
swapon_all /fstab.sun50iw1p1
restorecon_recursive /persist
#wait /dev/block/by-name/media_data
#mount vfat /dev/block/by-name/media_data /oem ro nosuid nodev utf8,context=u:object_r:oemfs:s0
on fs
insmod /system/vendor/modules/disp.ko
insmod /system/vendor/modules/sunxi_tr.ko

View file

@ -3,13 +3,14 @@
# 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/mmcblk0p1 /bootloader vfat defaults defaults
/dev/block/mmcblk0p2 /system ext4 defaults defaults
/dev/block/mmcblk0p3 /cache ext4 defaults defaults
/dev/block/mmcblk0p4 /data ext4 defaults defaults
/dev/block/mmcblk0p1 /bootloader vfat defaults defaults
loop@/bootloader/system.img /system ext4 defaults defaults
/dev/block/mmcblk0p2 /cache ext4 noatime,nosuid,nodev,barrier=1,data=ordered,nomblk_io_submit,noauto_da_alloc,errors=panic wait,check
/dev/block/mmcblk0p3 /data ext4 noatime,nosuid,nodev,barrier=1,data=ordered,nomblk_io_submit,noauto_da_alloc,errors=panic wait,check
/dev/block/mmcblk0p1 /sdcard vfat defaults defaults
/dev/block/mmcblk1p1 /extsd vfat defaults defaults
/dev/block/mmcblk1 /extsd vfat defaults defaults
/dev/block/sda1 /usbhost vfat defaults defaults
/dev/block/sda /usbhost vfat defaults defaults
/dev/block/mmcblk1p1 /extsd vfat defaults defaults
/dev/block/mmcblk1 /extsd vfat defaults defaults
/dev/block/sda1 /usbhost vfat defaults defaults
/dev/block/sda /usbhost vfat defaults defaults