diff options
| author | Tom Cherry <tomcherry@google.com> | 2018-11-30 16:16:05 -0800 |
|---|---|---|
| committer | Tom Cherry <tomcherry@google.com> | 2018-12-12 17:08:09 +0000 |
| commit | 23319ebebf6bda3b7aa085656ac5784534a4a574 (patch) | |
| tree | 70f578e4ab28c4cc31ae9b7d90ed49839eeca2a3 /init/builtins.cpp | |
| parent | e610ad619ed61e7c989e652516a66fc5548e3ac0 (diff) | |
Start using new C++ Fstab class widely
Bug: 62292478
Test: boot
Test: adb-remount-test.sh
Change-Id: Id4715af4c1f03e2cfc67de92d3ea58e933685e51
Diffstat (limited to 'init/builtins.cpp')
| -rw-r--r-- | init/builtins.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index 2bebe7673..7fd4e2737 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -473,9 +473,10 @@ static Result<int> mount_fstab(const char* fstabfile, int mount_mode) { // 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); - int child_ret = fs_mgr_mount_all(fstab, mount_mode); - fs_mgr_free_fstab(fstab); + Fstab fstab; + ReadFstabFromFile(fstabfile, &fstab); + + int child_ret = fs_mgr_mount_all(&fstab, mount_mode); if (child_ret == -1) { PLOG(ERROR) << "fs_mgr_mount_all returned an error"; } |