diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2020-07-14 14:27:33 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2020-07-14 14:27:33 +0530 |
| commit | 1a3f0a51dbcaa7169432b30f48770a985d26f8dd (patch) | |
| tree | 59b282a6b390003cc7578ba0b4946e117914d1c2 | |
| parent | 0331d9fe7aa2c1ae80235702c28fe25841df79e7 (diff) | |
| download | dragonboard410c-1a3f0a51dbcaa7169432b30f48770a985d26f8dd.tar.gz | |
fstab: Fix fstab installation path
Load fstab from /vendor/etc/ instead otherwise init
will be complain about it. Also use absolute device
path to mount userdata instead of LABEL=data.
Boot tested on db410c32_only-userdebug build.
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
| -rw-r--r-- | db410c32_only/device.mk | 2 | ||||
| -rw-r--r-- | db820c/device.mk | 2 | ||||
| -rw-r--r-- | fstab.common | 9 | ||||
| -rw-r--r-- | init.common.rc | 4 |
4 files changed, 10 insertions, 7 deletions
diff --git a/db410c32_only/device.mk b/db410c32_only/device.mk index 69af0ee..630e7ca 100644 --- a/db410c32_only/device.mk +++ b/db410c32_only/device.mk @@ -18,7 +18,7 @@ PRODUCT_COPY_FILES := \ $(LOCAL_PATH)/fstab.ramdisk:$(TARGET_COPY_OUT_RAMDISK)/fstab.db410c \ $(LOCAL_PATH)/fstab.ramdisk:$(TARGET_COPY_OUT_RAMDISK)/etc/fstab.db410c \ device/linaro/dragonboard-kernel/$(TARGET_PREBUILT_KERNEL):kernel \ - device/linaro/dragonboard/fstab.common:$(TARGET_COPY_OUT_VENDOR)/etc/init/fstab.db410c \ + device/linaro/dragonboard/fstab.common:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.db410c \ device/linaro/dragonboard/init.common.rc:root/init.db410c.rc \ device/linaro/dragonboard/init.common.usb.rc:root/init.db410c.usb.rc \ device/linaro/dragonboard/common.kl:system/usr/keylayout/db410c.kl diff --git a/db820c/device.mk b/db820c/device.mk index 4ec2ef3..4620b27 100644 --- a/db820c/device.mk +++ b/db820c/device.mk @@ -24,7 +24,7 @@ $(call inherit-product-if-exists, frameworks/native/build/tablet-10in-xhdpi-2048 PRODUCT_COPY_FILES := \ device/linaro/dragonboard-kernel/$(TARGET_PREBUILT_KERNEL):kernel \ - device/linaro/dragonboard/fstab.common:root/fstab.db820c \ + device/linaro/dragonboard/fstab.common:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.db820c \ device/linaro/dragonboard/init.common.rc:root/init.db820c.rc \ device/linaro/dragonboard/init.common.usb.rc:root/init.db820c.usb.rc \ $(LOCAL_PATH)/init.db820c.power.rc:root/init.db820c.power.rc \ diff --git a/fstab.common b/fstab.common index 47f626e..97ce2fb 100644 --- a/fstab.common +++ b/fstab.common @@ -2,8 +2,11 @@ #<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags> # 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 -LABEL=data /data ext4 discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait +# /data on db820c +/dev/block/platform/soc/624000.ufshc/by-name/userdata /data ext4 discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait,formattable +# /data on db410c +/dev/block/platform/soc/7824900.sdhci/by-name/userdata /data ext4 discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait,formattable # Ext sdcard on db820c -/devices/platform/soc/74a4900.sdhci/mmc_host/mmc* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata +/devices/platform/soc/74a4900.sdhci/mmc_host/mmc* auto auto defaults voldmanaged=sdcard1:auto # Ext sdcard on db410c -/devices/platform/soc/7864900.sdhci/mmc_host/mmc* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata +/devices/platform/soc/7864900.sdhci/mmc_host/mmc* auto auto defaults voldmanaged=sdcard1:auto diff --git a/init.common.rc b/init.common.rc index 3e99ee6..e35321b 100644 --- a/init.common.rc +++ b/init.common.rc @@ -2,8 +2,8 @@ import init.${ro.hardware}.usb.rc import init.${ro.hardware}.power.rc on fs - mount_all /fstab.${ro.hardware} - swapon_all /fstab.${ro.hardware} + mount_all /vendor/etc/fstab.${ro.hardware} + swapon_all /vendor/etc/fstab.${ro.hardware} setprop ro.crypto.fuse_sdcard false on init |