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

Commit 23319ebe authored by Tom Cherry's avatar Tom Cherry
Browse files

Start using new C++ Fstab class widely 

Bug: 62292478
Test: boot
Test: adb-remount-test.sh

Change-Id: Id4715af4c1f03e2cfc67de92d3ea58e933685e51
parent e610ad61

adb/daemon/remount_service.cpp

+2 −3
Original line number Diff line number Diff line
@@ -245,9 +245,8 @@ void remount_service(unique_fd fd, const std::string& cmd) { 
    // If we can use overlayfs, lets get it in place first

    // before we struggle with determining deduplication operations.

    if (!verity_enabled && fs_mgr_overlayfs_setup()) {

        std::unique_ptr<fstab, decltype(&fs_mgr_free_fstab)> fstab(fs_mgr_read_fstab_default(),

                                                                   fs_mgr_free_fstab);

        if (fs_mgr_overlayfs_mount_all(fstab.get())) {

        Fstab fstab;

        if (ReadDefaultFstab(&fstab) && fs_mgr_overlayfs_mount_all(&fstab)) {

            WriteFdExactly(fd.get(), "overlayfs mounted\n");

        }

    }