diff options
| author | Adam Shih <adamshih@google.com> | 2019-10-22 16:34:46 +0800 |
|---|---|---|
| committer | Adam Shih <adamshih@google.com> | 2019-10-23 15:49:16 +0800 |
| commit | 73d45ece88bc3b96f5125217f0d448f31354f518 (patch) | |
| tree | 6e1be7c03f728919f04b23b09ae6e9b5467eb033 /common | |
| parent | 9f949da85a83a3d0128e67d8436245c200759011 (diff) | |
move mounting from devices to common place
Bug: 130377452
Test: boot to home with persist and firmware images mounted
Change-Id: I70869334b45d1271e4f2b1fc0fa59f69e87e4cb3
Diffstat (limited to 'common')
| -rw-r--r-- | common/fstab.firmware | 4 | ||||
| -rw-r--r-- | common/fstab.persist | 4 | ||||
| -rw-r--r-- | common/init.firmware.rc | 11 | ||||
| -rw-r--r-- | common/pixel-common-device.mk | 6 |
4 files changed, 25 insertions, 0 deletions
diff --git a/common/fstab.firmware b/common/fstab.firmware new file mode 100644 index 0000000..5968dcc --- /dev/null +++ b/common/fstab.firmware @@ -0,0 +1,4 @@ +# Android fstab file. + +#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags> +/dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=0,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect diff --git a/common/fstab.persist b/common/fstab.persist new file mode 100644 index 0000000..f3840b1 --- /dev/null +++ b/common/fstab.persist @@ -0,0 +1,4 @@ +# Keep persist in an fstab file, since we need to run fsck on it after abnormal shutdown. + +#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags> +/dev/block/platform/soc/1d84000.ufshc/by-name/persist /mnt/vendor/persist ext4 nosuid,nodev,noatime,barrier=1 wait diff --git a/common/init.firmware.rc b/common/init.firmware.rc new file mode 100644 index 0000000..2895a4d --- /dev/null +++ b/common/init.firmware.rc @@ -0,0 +1,11 @@ +on early-init + mount_all /vendor/etc/fstab.persist --early + +on fs + mount_all /vendor/etc/fstab.firmware --early + +on late-fs + mount_all /vendor/etc/fstab.firmware --late + +on property:sys.boot_completed=1 + swapon_all /vendor/etc/fstab.firmware diff --git a/common/pixel-common-device.mk b/common/pixel-common-device.mk new file mode 100644 index 0000000..2cc5a81 --- /dev/null +++ b/common/pixel-common-device.mk @@ -0,0 +1,6 @@ +PRODUCT_COPY_FILES += \ + hardware/google/pixel/common/fstab.firmware:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.firmware \ + hardware/google/pixel/common/fstab.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist \ + hardware/google/pixel/common/init.firmware.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.firmware.rc + +BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/common |