Commit: bfa4c8dee51b84f86f7a768cac553b35011efa28 - system-core (git)

system/core

Commit MetaInfo

• Revision: bfa4c8dee51b84f86f7a768cac553b35011efa28 (tree)
• Time: 2019-03-05 14:43:30
• Author: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

init: expand variables on mount_all command

This allows mount_all to handle fstab.${ro.hardware} instead
of hardcoding the file name.

Change-Id: Ia7fb4e5a84dd50a46afdd4239b9b06204f449cfe

Change Summary

• modified: init/builtins.cpp

Incremental Difference

--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -443,13 +443,18 @@ static Result<int> mount_fstab(const char* fstabfile, int mount_mode) {
             return Error() << "child aborted";
         }
     } else if (pid == 0) {
+        std::string filename_val;
+        if (!expand_props(fstabfile, &filename_val)) {
+            PLOG(ERROR) << "mount_all: cannot expand '" << fstabfile << "'";
+            _exit(-1);
+        }
         /* child, call fs_mgr_mount_all() */
 
         // So we can always see what fs_mgr_mount_all() does.
         // Only needed if someone explicitly changes the default log level in their init.rc.
         android::base::ScopedLogSeverity info(android::base::INFO);
 
-        struct fstab* fstab = fs_mgr_read_fstab(fstabfile);
+        struct fstab* fstab = fs_mgr_read_fstab(filename_val.c_str());
         int child_ret = fs_mgr_mount_all(fstab, mount_mode);
         fs_mgr_free_fstab(fstab);
         if (child_ret == -1) {
@@ -540,7 +545,6 @@ static Result<Success> queue_fs_event(int code) {
  * not return.
  */
 static Result<Success> do_mount_all(const BuiltinArguments& args) {
-    std::size_t na = 0;
     bool import_rc = true;
     bool queue_event = true;
     int mount_mode = MOUNT_MODE_DEFAULT;
@@ -548,7 +552,7 @@ static Result<Success> do_mount_all(const BuiltinArguments& args) {
     std::size_t path_arg_end = args.size();
     const char* prop_post_fix = "default";
 
-    for (na = args.size() - 1; na > 1; --na) {
+    for (std::size_t na = args.size() - 1; na > 1; --na) {
         if (args[na] == "--early") {
             path_arg_end = na;
             queue_event = false;