Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9e6c202 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

fs_mgr: get fs_mgr_mount_all to call fs_mgr_overlayfs_mount_all 

After fs_mgr_mount_all has added the resources, let
fs_mgr_overlayfs_mount_all to read-only mount overlayfs over the
possible system partitions.

Test: compile
Bug: 109821005
Bug: 110985612
Change-Id: I7101a04c57de1a26283b1523636d07fa8e19ffc7
parent b28389f5

fs_mgr/fs_mgr.cpp

+7 −1
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
 * limitations under the License.

 */



#include "fs_mgr.h"



#include <ctype.h>

#include <dirent.h>

#include <errno.h>
@@ -51,6 +53,7 @@ 
#include <ext4_utils/ext4_sb.h>

#include <ext4_utils/ext4_utils.h>

#include <ext4_utils/wipe.h>

#include <fs_mgr_overlayfs.h>

#include <libdm/dm.h>

#include <linux/fs.h>

#include <linux/loop.h>
@@ -58,7 +61,6 @@ 
#include <log/log_properties.h>

#include <logwrap/logwrap.h>



#include "fs_mgr.h"

#include "fs_mgr_avb.h"

#include "fs_mgr_priv.h"
@@ -1035,6 +1037,10 @@ int fs_mgr_mount_all(struct fstab *fstab, int mount_mode) 
        }

    }



#if ALLOW_ADBD_DISABLE_VERITY == 1  // "userdebug" build

    fs_mgr_overlayfs_mount_all();

#endif



    if (error_count) {

        return FS_MGR_MNTALL_FAIL;

    } else {