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

Commit 342cfadb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Change log level in mount_with_alternatives()" am: 34386d2d 

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



Change-Id: If9ffc952c9008f017790c6add4defcd640e7542a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8ee78c7c 34386d2d

fs_mgr/fs_mgr.cpp

+6 −6
Original line number Diff line number Diff line
@@ -903,7 +903,7 @@ static bool mount_with_alternatives(Fstab& fstab, int start_idx, int* end_idx, 
        // Deal with alternate entries for the same point which are required to be all following

        // each other.

        if (mounted) {

            LERROR << __FUNCTION__ << "(): skipping fstab dup mountpoint=" << fstab[i].mount_point

            LINFO << __FUNCTION__ << "(): skipping fstab dup mountpoint=" << fstab[i].mount_point

                  << " rec[" << i << "].fs_type=" << fstab[i].fs_type << " already mounted as "

                  << fstab[*attempted_idx].fs_type;

            continue;
@@ -933,7 +933,7 @@ static bool mount_with_alternatives(Fstab& fstab, int start_idx, int* end_idx, 
                *attempted_idx = i;

                mounted = true;

                if (i != start_idx) {

                    LERROR << __FUNCTION__ << "(): Mounted " << fstab[i].blk_device << " on "

                    LINFO << __FUNCTION__ << "(): Mounted " << fstab[i].blk_device << " on "

                          << fstab[i].mount_point << " with fs_type=" << fstab[i].fs_type

                          << " instead of " << fstab[start_idx].fs_type;

                }