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

Commit 4c831001 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

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

am: 1af42f64

Change-Id: I728c21df77e1aac6e4d9c055369a3c6b8b1cbd62
parents 7e3e59a5 1af42f64

fs_mgr/fs_mgr_overlayfs.cpp

+3 −1
Original line number Diff line number Diff line
@@ -612,7 +612,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;