From 67db1379fc6850228310525ffb1f4ec8df95f26e Mon Sep 17 00:00:00 2001
From: synt4x93 <synt4x.93@gmail.com>
Date: Thu, 17 Dec 2020 18:53:59 +0000
Subject: [PATCH] universal9810: rootdir: fstab: import

Change-Id: I84c855aeeb722da41e36afff16ceb609886e5e05
---
 rootdir/Android.mk                  |  5 +++--
 rootdir/etc/fstab.samsungexynos9810 | 10 ++++++++++
 rootdir/etc/fstab.zram              |  5 -----
 rootdir/etc/init.samsung.rc         |  2 +-
 universal9810-common.mk             |  4 ++--
 5 files changed, 16 insertions(+), 10 deletions(-)
 create mode 100644 rootdir/etc/fstab.samsungexynos9810
 delete mode 100755 rootdir/etc/fstab.zram

diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 6649f1a..1d6db9f 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -1,10 +1,11 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE            := fstab.zram
+LOCAL_MODULE            := fstab.samsungexynos9810
 LOCAL_MODULE_TAGS       := optional
 LOCAL_MODULE_CLASS      := ETC
-LOCAL_SRC_FILES         := etc/fstab.zram
+LOCAL_SRC_FILES         := etc/fstab.samsungexynos9810
+LOCAL_MODULE_PATH       := $(TARGET_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/etc
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
diff --git a/rootdir/etc/fstab.samsungexynos9810 b/rootdir/etc/fstab.samsungexynos9810
new file mode 100644
index 0000000..8aeeeb1
--- /dev/null
+++ b/rootdir/etc/fstab.samsungexynos9810
@@ -0,0 +1,10 @@
+#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
+/dev/block/platform/11120000.ufs/by-name/CACHE /cache ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic wait,check
+/dev/block/platform/11120000.ufs/by-name/USERDATA /data ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic wait,check,encryptable=footer,quota,reservedsize=128M,length=-20480
+/dev/block/platform/11120000.ufs/by-name/EFS /mnt/vendor/efs ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic wait,check
+/dev/block/platform/11120000.ufs/by-name/CPEFS /mnt/vendor/cpefs ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic wait,check,nofail
+/dev/block/platform/11120000.ufs/by-name/MISC /misc emmc defaults defaults
+/dev/block/platform/11120000.ufs/by-name/HIDDEN /preload ext4 noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic voldmanaged=preload:auto,check
+/devices/platform/11500000.dwmmc2/mmc_host* auto auto defaults voldmanaged=sdcard:auto
+/devices/platform/10c00000.usb/10c00000.dwc3* auto auto defaults voldmanaged=usb:auto
+/dev/block/zram0 none swap defaults zramsize=2147483648,max_comp_streams=8
diff --git a/rootdir/etc/fstab.zram b/rootdir/etc/fstab.zram
deleted file mode 100755
index 9791053..0000000
--- a/rootdir/etc/fstab.zram
+++ /dev/null
@@ -1,5 +0,0 @@
-# Android fstab file.
-#<src>                   <mnt_point>         <type>    <mnt_flags and options>                               <fs_mgr_flags>
-
-# ZRAM
-/dev/block/zram0                                        none        swap    defaults    zramsize=2147483648,max_comp_streams=8
diff --git a/rootdir/etc/init.samsung.rc b/rootdir/etc/init.samsung.rc
index 8ffb944..0bd8c71 100644
--- a/rootdir/etc/init.samsung.rc
+++ b/rootdir/etc/init.samsung.rc
@@ -31,7 +31,7 @@ service lpm /system/bin/lpm
     critical
 
 on fs
-    swapon_all /system/etc/fstab.zram
+    swapon_all /vendor/etc/fstab.${ro.hardware}
 
 on late-fs
     write /sys/block/sda/queue/iostats 0
diff --git a/universal9810-common.mk b/universal9810-common.mk
index 21f30ac..45c0abf 100644
--- a/universal9810-common.mk
+++ b/universal9810-common.mk
@@ -59,9 +59,9 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     Snap
 
-# Init
+# Rootdir
 PRODUCT_PACKAGES += \
-    fstab.zram \
+    fstab.samsungexynos9810 \
     init.samsung.rc \
     init.usb_accessory.rc