init: use init's property expansion code for mount_all
Change-Id: I3bd00c74cd126b66927eca7812943f8427009356
Signed-off-by: Nan Liu <nan.liu619@gmail.com>
diff --git a/init/builtins.cpp b/init/builtins.cpp
index d5d3faf..8d47da4 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -468,11 +468,17 @@
int child_ret = -1;
int status;
struct fstab *fstab;
+ char fstabfile[PROP_VALUE_MAX];
if (nargs != 2) {
return -1;
}
+ if (expand_props(fstabfile, args[1], sizeof(fstabfile)) == -1) {
+ ERROR("mount_all: cannot expand '%s' \n", args[1]);
+ return -EINVAL;
+ }
+
/*
* Call fs_mgr_mount_all() to mount all filesystems. We fork(2) and
* do the call in the child to provide protection to the main init
@@ -496,7 +502,7 @@
} else if (pid == 0) {
/* 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(args[1]);
+ fstab = fs_mgr_read_fstab(fstabfile);
child_ret = fs_mgr_mount_all(fstab);
fs_mgr_free_fstab(fstab);
if (child_ret == -1) {