Merge "Move early_hal start to late-fs trigger action"
am: 9ef4417c8e
Change-Id: Idb37ec8456a6c3855cb56128e79d9a02bdcc06c2
diff --git a/rootdir/init.rc b/rootdir/init.rc
index ff96c14..3758362 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -301,9 +301,6 @@
start logd
start hwservicemanager
- # HALs required before data is mounted
- class_start early_hal
-
# once everything is setup, no need to modify /
mount rootfs rootfs / ro remount
# Mount shared so changes propagate into child namespaces
@@ -351,6 +348,10 @@
# create the lost+found directories, so as to enforce our permissions
mkdir /cache/lost+found 0770 root root
+on late-fs
+ # HALs required before storage encryption can get unlocked (FBE/FDE)
+ class_start early_hal
+
on post-fs-data
# We chown/chmod /data again so because mount is run as root + defaults
chown system system /data