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

Commit 062eb59a authored by Kelvin Zhang's avatar Kelvin Zhang Committed by Gerrit Code Review
Browse files

Revert "Set ro.fstype.data when /data is mounted" 

Revert submission 3095293-fstype

Reason for revert: breaks build cf_x86_64_only_phone-next-userdebug

Reverted changes: /q/submissionid:3095293-fstype

Change-Id: I2d1b2561ec7a3d8ea954b375153dce1a936d0294
parent 78c65e52

fs_mgr/fs_mgr.cpp

+0 −13
Original line number Diff line number Diff line
@@ -1656,19 +1656,6 @@ 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);