ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* commit '48ba758782bed8c50f450fd77c4b3284c3fa7316':
  Improve bad error reporting seen in shamu SELinux boot failures.
This commit is contained in:
Elliott Hughes 2015-04-24 18:58:21 +00:00 • committed by Android Git Automerger
commit 92f075aa08
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs_mgr/fs_mgr.c
View file

@ -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 * filesytsem due to an error, e2fsck is still run to do a full check
* fix the filesystem. * fix the filesystem.
*/ */
errno = 0;
ret = mount(blk_device, target, fs_type, tmpmnt_flags, tmpmnt_opts); 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) { if (!ret) {
int i; int i;
for (i = 0; i < 5; 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? // Should we try rebooting if all attempts fail?
int result = umount(target); int result = umount(target);
if (result == 0) { if (result == 0) {
INFO("%s(): unmount(%s) succeeded\n", __func__, target);
break; break;
} }
ERROR("%s(): umount(%s)=%d: %s\n", __func__, target, result, strerror(errno)); ERROR("%s(): umount(%s)=%d: %s\n", __func__, target, result, strerror(errno));