summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/init.rc6
-rw-r--r--uncrypt/uncrypt.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/etc/init.rc b/etc/init.rc
index 6c07c6027..427727768 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -47,8 +47,8 @@ on boot
class_start default
# Load properties from /system/ + /factory after fs mount.
-on load_all_props_action
- load_all_props
+on load_system_props_action
+ load_system_props
on firmware_mounts_complete
rm /dev/.booting
@@ -63,7 +63,7 @@ on late-init
# Load properties from /system/ + /factory after fs mount. Place
# this in another action so that the load will be scheduled after the prior
# issued fs triggers have completed.
- trigger load_all_props_action
+ trigger load_system_props_action
# Remove a file to wake up anything waiting for firmware
trigger firmware_mounts_complete
diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp
index 1db3013c6..46da86d61 100644
--- a/uncrypt/uncrypt.cpp
+++ b/uncrypt/uncrypt.cpp
@@ -144,7 +144,7 @@ static const char* find_block_device(const char* path, bool* encryptable, bool*
(path[len] == '/' || path[len] == 0)) {
*encrypted = false;
*encryptable = false;
- if (fs_mgr_is_encryptable(v)) {
+ if (fs_mgr_is_encryptable(v) || fs_mgr_is_file_encrypted(v)) {
*encryptable = true;
char buffer[PROPERTY_VALUE_MAX+1];
if (property_get("ro.crypto.state", buffer, "") &&