diff options
| author | Elliott Hughes <enh@google.com> | 2015-04-24 18:36:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-24 18:36:55 +0000 |
| commit | 34dd04dbb53bc6dc1ec4f9c6639b10acb7c53c72 (patch) | |
| tree | 6b39e2205a8c4f36ec8c5c27664dadb37d3d5f0e | |
| parent | 10936d1fdb639c91ed9062b92909d9928e6b69ea (diff) | |
| parent | 5e7dd4454f066f5d2d138f4f8bb8739245b29bf2 (diff) | |
| download | system_core-34dd04dbb53bc6dc1ec4f9c6639b10acb7c53c72.zip system_core-34dd04dbb53bc6dc1ec4f9c6639b10acb7c53c72.tar.gz system_core-34dd04dbb53bc6dc1ec4f9c6639b10acb7c53c72.tar.bz2 | |
Merge "Improve bad error reporting seen in shamu SELinux boot failures."
| -rw-r--r-- | fs_mgr/fs_mgr.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c index 273a2ec..47ea9aa 100644 --- a/fs_mgr/fs_mgr.c +++ b/fs_mgr/fs_mgr.c @@ -117,8 +117,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++) { @@ -126,6 +128,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)); |