Commit: 58ebdb6ad9d8f0391e74f20ac83cd2f6dbfce026 - system-coremmmm (git)

system/corennnnn

Commit MetaInfo

• Revision: 58ebdb6ad9d8f0391e74f20ac83cd2f6dbfce026 (tree)
• Time: 2016-08-18 17:04:52
• 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 Summary

• modified: init/builtins.cpp

Incremental Difference

--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -528,9 +528,14 @@ static int do_mount_all(const std::vector<std::string>& args) {
             ret = -1;
         }
     } else if (pid == 0) {
+        std::string filename_val;
+        if (!expand_props(args[1], &filename_val)) {
+            ERROR("mount_all: cannot expand '%s'\n", fstabfile);
+            _exit(-1);
+        }
         /* child, call fs_mgr_mount_all() */
         klog_set_level(6);  /* So we can see what fs_mgr_mount_all() does */
-        fstab = fs_mgr_read_fstab(fstabfile);
+        fstab = fs_mgr_read_fstab(filename_val.c_str());
         child_ret = fs_mgr_mount_all(fstab);
         fs_mgr_free_fstab(fstab);
         if (child_ret == -1) {