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

Commit e16fdcd6 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by David Anderson
Browse files

fs_mgr: overlay: only use system_<other> if other slot suffix not blank 

Test: adb-remount-test.sh
Bug: 129988285
Change-Id: Ib929d242e7cc4953096eb6300bcf7888ce2259ab
Merged-In: Ib929d242e7cc4953096eb6300bcf7888ce2259ab
parent 490f1cf0

fs_mgr/fs_mgr_overlayfs.cpp

+3 −1
Original line number Diff line number Diff line
@@ -621,7 +621,9 @@ std::string fs_mgr_overlayfs_scratch_device() { 
        if (!dm.GetDmDevicePathByName(partition_name, &path)) {

            // non-DAP A/B device?

            if (fs_mgr_access(super_device)) return "";

            path = kPhysicalDevice + "system" + (slot_number ? "_a" : "_b");

            auto other_slot = fs_mgr_get_other_slot_suffix();

            if (other_slot.empty()) return "";

            path = kPhysicalDevice + "system" + other_slot;

        }

    }

    return scratch_device_cache = path;