From 98a73a2ce10df46bc8d095413b415e284206836b Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Mon, 12 Jun 2017 17:07:11 +0000 Subject: [PATCH] Revert "Load default prop from /system/etc/prop.default" This reverts commit 810d71b0050bb94fe9bbcd02368dafd52cebdeb7. init fails to read default.prop under recovery: init: Couldn't load properties from /default.prop: Too many symbolic links encountered Bug: 62525809 Change-Id: I1f84a18e545e1307dcb230be51606cca731667f9 --- init/property_service.cpp | 12 ++++-------- libcutils/fs_config.c | 3 +-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/init/property_service.cpp b/init/property_service.cpp index 60c1895f1..5884cb60c 100644 --- a/init/property_service.cpp +++ b/init/property_service.cpp @@ -444,7 +444,7 @@ static void handle_property_set_fd() { } } -static bool load_properties_from_file(const char *, const char *); +static void load_properties_from_file(const char *, const char *); /* * Filter is used to decide which properties to load: NULL loads all keys, @@ -508,17 +508,16 @@ static void load_properties(char *data, const char *filter) // Filter is used to decide which properties to load: NULL loads all keys, // "ro.foo.*" is a prefix match, and "ro.foo.bar" is an exact match. -static bool load_properties_from_file(const char* filename, const char* filter) { +static void load_properties_from_file(const char* filename, const char* filter) { Timer t; std::string data; if (!read_file(filename, &data)) { PLOG(WARNING) << "Couldn't load properties from " << filename; - return false; + return; } data.push_back('\n'); load_properties(&data[0], filter); LOG(VERBOSE) << "(Loading properties from " << filename << " took " << t << ".)"; - return true; } static void load_persistent_properties() { @@ -593,10 +592,7 @@ static void update_sys_usb_config() { } void property_load_boot_defaults() { - if (!load_properties_from_file("/system/etc/prop.default", NULL)) { - // legacy path - load_properties_from_file("/default.prop", NULL); - } + load_properties_from_file("/default.prop", NULL); load_properties_from_file("/odm/default.prop", NULL); load_properties_from_file("/vendor/default.prop", NULL); diff --git a/libcutils/fs_config.c b/libcutils/fs_config.c index 5b9d17429..d98a923c9 100644 --- a/libcutils/fs_config.c +++ b/libcutils/fs_config.c @@ -135,8 +135,7 @@ static const struct fs_path_config android_files[] = { { 00640, AID_ROOT, AID_SHELL, 0, "data/nativetest64/tests.txt" }, { 00750, AID_ROOT, AID_SHELL, 0, "data/nativetest/*" }, { 00750, AID_ROOT, AID_SHELL, 0, "data/nativetest64/*" }, - { 00600, AID_ROOT, AID_ROOT, 0, "default.prop" }, // legacy - { 00600, AID_ROOT, AID_ROOT, 0, "system/etc/prop.default" }, + { 00600, AID_ROOT, AID_ROOT, 0, "default.prop" }, { 00600, AID_ROOT, AID_ROOT, 0, "odm/build.prop" }, { 00600, AID_ROOT, AID_ROOT, 0, "odm/default.prop" }, { 00444, AID_ROOT, AID_ROOT, 0, odm_conf_dir + 1 },