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

Commit 6c9a542d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Set ro.fstype.data when /data is mounted" into main am: ac792321 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3095293



Change-Id: I416213952c9c7dcf64e2b04504696b83211ab10a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bee4b391 ac792321

fs_mgr/fs_mgr.cpp

+13 −0
Original line number Diff line number Diff line
@@ -1656,6 +1656,19 @@ MountAllResult fs_mgr_mount_all(Fstab* fstab, int mount_mode) { 
            continue;

        }

    }

    if (userdata_mounted) {

        Fstab mounted_fstab;

        if (!ReadFstabFromFile("/proc/mounts", &mounted_fstab)) {

            LOG(ERROR) << "Could't load fstab from /proc/mounts , unable to set ro.fstype.data . "

                          "init.rc actions depending on this prop would not run, boot might fail.";

        } else {

            for (const auto& entry : mounted_fstab) {

                if (entry.mount_point == "/data") {

                    android::base::SetProperty("ro.fstype.data", entry.fs_type);

                }

            }

        }

    }



    set_type_property(encryptable);