guacamole: override fstab.qcom from vendor to remove wrappedkey

* OnePlus has `wrappedkey` enabled in their fstab but actually does not
use it at all. To match this, we have to override the fstab by
bind-mounting.
This commit is contained in:
Peter Cai 2019-06-20 11:04:39 +08:00
parent 30d852c9a1
commit ee6ee60aa8
No known key found for this signature in database
GPG Key ID: 71F5FB4E4F3FD54F
3 changed files with 6 additions and 2 deletions

View File

@ -20,6 +20,9 @@ DEVICE_PACKAGE_OVERLAYS += \
PRODUCT_PACKAGES += \
fs_config_files
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/rootdir/etc/fstab.qcom:system/etc/fstab.qcom
# Audio
PRODUCT_PACKAGES += \
audio.a2dp.default \

View File

@ -32,8 +32,8 @@
#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
/dev/block/bootdevice/by-name/system / ext4 ro,barrier=1,discard wait,slotselect,avb
/dev/block/bootdevice/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,formattable
/dev/block/bootdevice/by-name/userdata /data ext4 noatime,nosuid,nodev,barrier=1,noauto_da_alloc,discard latemount,wait,check,fileencryption=ice,wrappedkey,keydirectory=/metadata/vold/metadata_encryption,quota,reservedsize=512M
/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,fsync_mode=nobarrier latemount,wait,check,fileencryption=ice,wrappedkey,keydirectory=/metadata/vold/metadata_encryption,quota,formattable,reservedsize=128M
/dev/block/bootdevice/by-name/userdata /data ext4 noatime,nosuid,nodev,barrier=1,noauto_da_alloc,discard latemount,wait,check,fileencryption=ice,keydirectory=/metadata/vold/metadata_encryption,quota,reservedsize=512M
/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,fsync_mode=nobarrier latemount,wait,check,fileencryption=ice,keydirectory=/metadata/vold/metadata_encryption,quota,formattable,reservedsize=128M
#/dev/block/bootdevice/by-name/userdata /data ext4 noatime,nosuid,nodev,barrier=1,noauto_da_alloc,discard latemount,wait,check,fileencryption=ice,wrappedkey,keydirectory=/metadata/vold/metadata_encryption,quota,reservedsize=128M
/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 noatime,nosuid,nodev,barrier=1 wait

View File

@ -1,3 +1,4 @@
on init
mount none /system/etc/audio_policy_configuration.xml /vendor/etc/audio/audio_policy_configuration.xml bind
mount none /system/etc/media_profiles_vendor.xml /vendor/etc/media_profiles_vendor.xml bind
mount none /system/etc/fstab.qcom /vendor/etc/fstab.qcom bind