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

Commit 92f075aa authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 48ba7587: am 34dd04db: Merge "Improve bad error reporting seen in shamu SELinux boot failures." 

* commit '48ba7587':
  Improve bad error reporting seen in shamu SELinux boot failures.
parents 17560f88 48ba7587

fs_mgr/fs_mgr.c

+4 −1
Original line number Diff line number Diff line
@@ -120,8 +120,10 @@ static void check_fs(char *blk_device, char *fs_type, char *target) 
         * filesytsem due to an error, e2fsck is still run to do a full check

         * fix the filesystem.

         */

        errno = 0;

        ret = mount(blk_device, target, fs_type, tmpmnt_flags, tmpmnt_opts);

        INFO("%s(): mount(%s,%s,%s)=%d\n", __func__, blk_device, target, fs_type, ret);

        INFO("%s(): mount(%s,%s,%s)=%d: %s\n",

             __func__, blk_device, target, fs_type, ret, strerror(errno));

        if (!ret) {

            int i;

            for (i = 0; i < 5; i++) {
@@ -129,6 +131,7 @@ static void check_fs(char *blk_device, char *fs_type, char *target) 
                // Should we try rebooting if all attempts fail?

                int result = umount(target);

                if (result == 0) {

                    INFO("%s(): unmount(%s) succeeded\n", __func__, target);

                    break;

                }

                ERROR("%s(): umount(%s)=%d: %s\n", __func__, target, result, strerror(errno));