Merge "fs_mgr: use different fstab paths for normal/recovery boot"
diff --git a/fs_mgr/fs_mgr_avb.cpp b/fs_mgr/fs_mgr_avb.cpp
index 35577e3..a762038 100644
--- a/fs_mgr/fs_mgr_avb.cpp
+++ b/fs_mgr/fs_mgr_avb.cpp
@@ -454,12 +454,12 @@
// be returned when there is an error.
std::string hash_alg;
- if (fs_mgr_get_boot_config("vbmeta.hash_alg", &hash_alg) == 0) {
- if (hash_alg == "sha256" || hash_alg == "sha512") {
- return true;
- }
+ if (!fs_mgr_get_boot_config("vbmeta.hash_alg", &hash_alg)) {
+ return false;
}
-
+ if (hash_alg == "sha256" || hash_alg == "sha512") {
+ return true;
+ }
return false;
}
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 0045fd6..7091ab9 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -299,6 +299,8 @@
on post-fs
start logd
+ start hwservicemanager
+
# once everything is setup, no need to modify /
mount rootfs rootfs / ro remount
# Mount shared so changes propagate into child namespaces
@@ -589,8 +591,9 @@
# Define default initial receive window size in segments.
setprop net.tcp.default_init_rwnd 60
- # Start all binderized HAL daemons
- start hwservicemanager
+ # Start standard binderized HAL daemons
+ class_start hal
+
class_start core
on nonencrypted