summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Pundir <amit.pundir@linaro.org>2018-04-17 11:19:21 +0530
committerAmit Pundir <amit.pundir@linaro.org>2018-04-17 11:19:21 +0530
commite34c75dd5cee437c07b882493530b53eeda93e2e (patch)
tree705ac09726861549088c68ca2d7e6f1e3bb11eef
parent31b9c19457fd4368807ddf32528e5e501ba706e4 (diff)
fstab: Switch to common fstab
Use mount by LABEL=$partition in fstab.common Change-Id: I4477c9334c4a37ffc55a1018a50f06d682ff2507 Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
-rw-r--r--db410c32_only/device.mk2
-rw-r--r--db410c32_only/fstab.db410c7
-rw-r--r--db820c/device.mk2
-rw-r--r--db820c/fstab.db820c7
-rw-r--r--fstab.common7
5 files changed, 9 insertions, 16 deletions
diff --git a/db410c32_only/device.mk b/db410c32_only/device.mk
index 2b32c5a..6264143 100644
--- a/db410c32_only/device.mk
+++ b/db410c32_only/device.mk
@@ -16,7 +16,7 @@
PRODUCT_COPY_FILES := \
device/linaro/dragonboard-kernels/$(TARGET_PREBUILT_KERNEL):kernel \
- device/linaro/dragonboard/db410c32_only/fstab.db410c:root/fstab.db410c \
+ device/linaro/dragonboard/fstab.common:root/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/ueventd.common.rc:root/ueventd.db410c.rc \
diff --git a/db410c32_only/fstab.db410c b/db410c32_only/fstab.db410c
deleted file mode 100644
index 888775a..0000000
--- a/db410c32_only/fstab.db410c
+++ /dev/null
@@ -1,7 +0,0 @@
-# Android fstab file.
-#<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
-/dev/block/platform/soc/7824900.sdhci/by-name/system /system ext4 ro wait
-/dev/block/platform/soc/7824900.sdhci/by-name/cache /cache ext4 discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait
-/dev/block/platform/soc/7824900.sdhci/by-name/userdata /data ext4 discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait
diff --git a/db820c/device.mk b/db820c/device.mk
index 640d434..15311ab 100644
--- a/db820c/device.mk
+++ b/db820c/device.mk
@@ -16,7 +16,7 @@
PRODUCT_COPY_FILES := \
device/linaro/dragonboard-kernels/$(TARGET_PREBUILT_KERNEL):kernel \
- $(LOCAL_PATH)/fstab.db820c:root/fstab.db820c \
+ device/linaro/dragonboard/fstab.common:root/fstab.db820c \
device/linaro/dragonboard/init.common.rc:root/init.db820c.rc \
device/linaro/dragonboard/init.common.usb.rc:root/init.db820c.usb.rc \
device/linaro/dragonboard/ueventd.common.rc:root/ueventd.db820c.rc \
diff --git a/db820c/fstab.db820c b/db820c/fstab.db820c
deleted file mode 100644
index cc86d90..0000000
--- a/db820c/fstab.db820c
+++ /dev/null
@@ -1,7 +0,0 @@
-# Android fstab file.
-#<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
-/dev/block/sde18 /system ext4 ro wait
-/dev/block/sda3 /cache ext4 discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait
-/dev/block/sda9 /data ext4 discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait
diff --git a/fstab.common b/fstab.common
new file mode 100644
index 0000000..67cefc2
--- /dev/null
+++ b/fstab.common
@@ -0,0 +1,7 @@
+# Android fstab file.
+#<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=system /system ext4 ro wait
+LABEL=cache /cache ext4 discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait
+LABEL=data /data ext4 discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait