diff options
| author | John Stultz <john.stultz@linaro.org> | 2021-07-28 00:09:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-28 00:09:06 +0000 |
| commit | f1637ed57c95916d52c44d00fadae9f0416dc313 (patch) | |
| tree | 0a47edba4a3ab2de40bb1ba2abab2b9031fbc5fe | |
| parent | a08bae2ab1ee4a0ac23a6731201b38734c029a9b (diff) | |
| parent | b740fd1be465e61a821fc94b13712ce5f6b839bc (diff) | |
| download | hikey-f1637ed57c95916d52c44d00fadae9f0416dc313.tar.gz | |
HiKey960: Enable metadata encryption am: 03c11dfce2 am: b740fd1be4
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1778880
Change-Id: I505c88b375283eed35c0a8d67fa23acca4af9227
| -rw-r--r-- | hikey/init.hikey.rc | 3 | ||||
| -rw-r--r-- | hikey960/fstab.hikey960 | 2 | ||||
| -rw-r--r-- | hikey960/init.hikey960.rc | 6 | ||||
| -rw-r--r-- | init.common.rc | 4 |
4 files changed, 13 insertions, 2 deletions
diff --git a/hikey/init.hikey.rc b/hikey/init.hikey.rc index 8046f91f..6ea3b3b3 100644 --- a/hikey/init.hikey.rc +++ b/hikey/init.hikey.rc @@ -1,5 +1,8 @@ import init.common.rc +on fs + mount_all /vendor/etc/fstab.${ro.hardware} + on post-fs # Set supported opengles version setprop ro.hardware.hwcomposer drm_hikey diff --git a/hikey960/fstab.hikey960 b/hikey960/fstab.hikey960 index 58913231..09356a7a 100644 --- a/hikey960/fstab.hikey960 +++ b/hikey960/fstab.hikey960 @@ -6,7 +6,7 @@ #/dev/block/platform/soc/ff3b0000.ufs/by-name/system_a /system ext4 ro wait #/dev/block/platform/soc/ff3b0000.ufs/by-name/cache /cache ext4 discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait #/dev/block/platform/soc/ff3b0000.ufs/by-name/userdata /data ext4 discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait -/dev/block/by-name/userdata /data ext4 discard,noatime,nosuid,nodev,noauto_da_alloc,data=ordered,user_xattr,barrier=1,inlinecrypt wait,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized,quota +/dev/block/by-name/userdata /data ext4 discard,noatime,nosuid,nodev,noauto_da_alloc,data=ordered,user_xattr,barrier=1,inlinecrypt latemount,wait,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized,keydirectory=/metadata/vold/metadata_encryption,quota /dev/block/by-name/cache /metadata ext4 noatime,nosuid,nodev,discard wait,formattable,first_stage_mount,check /devices/platform/soc/ff37f000.dwmmc1/mmc_host/mmc* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata /devices/platform/soc/ff200000.hisi_usb/ff100000.dwc3/xhci-hcd.*.auto/usb* auto auto defaults voldmanaged=usbdisk:auto,encryptable=userdata diff --git a/hikey960/init.hikey960.rc b/hikey960/init.hikey960.rc index b7671340..92c1385e 100644 --- a/hikey960/init.hikey960.rc +++ b/hikey960/init.hikey960.rc @@ -1,6 +1,12 @@ import init.common.rc +on fs + mount_all /vendor/etc/fstab.${ro.hardware} --early + on post-fs # Set supported opengles version setprop ro.hardware.hwcomposer drm_hikey960 +on late-fs + mount_all /vendor/etc/fstab.${ro.hardware} --late + diff --git a/init.common.rc b/init.common.rc index 1ae164b7..7018eeff 100644 --- a/init.common.rc +++ b/init.common.rc @@ -16,8 +16,10 @@ on init start watchdogd +on early-fs + start vold + on fs - mount_all /vendor/etc/fstab.${ro.hardware} setprop ro.crypto.fuse_sdcard false on post-fs |