From 532672ba7837cbcaf2bb885233e32e1de6c53e69 Mon Sep 17 00:00:00 2001
From: Andreas Blaesius <skate4life@gmx.de>
Date: Fri, 14 Aug 2015 05:05:57 -0700
Subject: espresso-common: fix ramdisk (1/3)

Vold expects fstab.${ro.hardware}.

mount_all /fstab.${ro.hardware} doesn't work, and ends in bootloop.
Let's move the mount_all line to init.device.${ro.hardware}.rc

(Thanks to Tuxafgmur @ XDA)

Change-Id: I3642c77fc756a64788417919f6fd195f628a8c76
---
 rootdir/Android.mk                    | 20 ++++++++++++++++++++
 rootdir/etc/init.device.espresso.rc   |  2 ++
 rootdir/etc/init.device.espresso10.rc |  2 ++
 rootdir/etc/init.tab2.rc              |  2 +-
 4 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 rootdir/etc/init.device.espresso.rc
 create mode 100644 rootdir/etc/init.device.espresso10.rc

diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index abbf448..4d6686f 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -3,7 +3,11 @@ include $(CLEAR_VARS)
 
 # boot.img parts
 include $(CLEAR_VARS)
+ifneq ($(filter p3100 p3110,$(TARGET_DEVICE)),)
 LOCAL_MODULE       := fstab.espresso
+else
+LOCAL_MODULE       := fstab.espresso10
+endif
 LOCAL_MODULE_TAGS  := optional eng
 LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES    := etc/fstab.tab2
@@ -46,6 +50,22 @@ LOCAL_SRC_FILES    := etc/ueventd.tab2.rc
 LOCAL_MODULE_PATH  := $(TARGET_ROOT_OUT)
 include $(BUILD_PREBUILT)
 
+include $(CLEAR_VARS)
+ifneq ($(filter p3100 p3110,$(TARGET_DEVICE)),)
+LOCAL_MODULE       := init.device.espresso.rc
+else
+LOCAL_MODULE       := init.device.espresso10.rc
+endif
+LOCAL_MODULE_TAGS  := optional eng
+LOCAL_MODULE_CLASS := ETC
+ifneq ($(filter p3100 p3110,$(TARGET_DEVICE)),)
+LOCAL_SRC_FILES    := etc/init.device.espresso.rc
+else
+LOCAL_SRC_FILES    := etc/init.device.espresso10.rc
+endif
+LOCAL_MODULE_PATH  := $(TARGET_ROOT_OUT)
+include $(BUILD_PREBUILT)
+
 # recovery.img parts
 ifneq ($(filter p3100 p3110,$(TARGET_DEVICE)),)
 include $(CLEAR_VARS)
diff --git a/rootdir/etc/init.device.espresso.rc b/rootdir/etc/init.device.espresso.rc
new file mode 100644
index 0000000..fa47c87
--- /dev/null
+++ b/rootdir/etc/init.device.espresso.rc
@@ -0,0 +1,2 @@
+on fs
+    mount_all /fstab.espresso
diff --git a/rootdir/etc/init.device.espresso10.rc b/rootdir/etc/init.device.espresso10.rc
new file mode 100644
index 0000000..d1accab
--- /dev/null
+++ b/rootdir/etc/init.device.espresso10.rc
@@ -0,0 +1,2 @@
+on fs
+    mount_all /fstab.espresso10
diff --git a/rootdir/etc/init.tab2.rc b/rootdir/etc/init.tab2.rc
index 3278b07..8469cd2 100644
--- a/rootdir/etc/init.tab2.rc
+++ b/rootdir/etc/init.tab2.rc
@@ -1,4 +1,5 @@
 import init.${ro.hardware}.usb.rc
+import init.device.${ro.hardware}.rc
 
 on init
     mkdir /mnt/shell/emulated 0700 shell shell
@@ -45,7 +46,6 @@ loglevel 7
 
 on fs
     mkdir /efs
-    mount_all /fstab.espresso
 
     setprop ro.crypto.fuse_sdcard true
 
-- 
cgit v1.1