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

Commit 86c33b9d authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

Merge "Start using new C++ Fstab class widely" am: 07eea062

am: 7481fe93

Change-Id: I3b201cd80e90efc9f355673a2ed2a68979fb5fd1
parents ecc3a35e 7481fe93
Loading
Loading
Loading
Loading
+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");
        }
    }
Loading