diff options
| author | Elliott Hughes <enh@google.com> | 2015-04-24 21:09:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-24 21:09:00 +0000 |
| commit | 4822bd197d7214f14a59e1d516f668640db5da71 (patch) | |
| tree | 0ff8b14d706dcbdf1b5d4f9ae7bfd7bac21938b3 /fs_mgr | |
| parent | f42a722d7c16beccb77654b20fc49ef79f529eab (diff) | |
| parent | 92f075aa08a2665ad03c80a0408667f8864f1ecd (diff) | |
| download | system_core-4822bd197d7214f14a59e1d516f668640db5da71.zip system_core-4822bd197d7214f14a59e1d516f668640db5da71.tar.gz system_core-4822bd197d7214f14a59e1d516f668640db5da71.tar.bz2 | |
am 92f075aa: am 48ba7587: am 34dd04db: Merge "Improve bad error reporting seen in shamu SELinux boot failures."
* commit '92f075aa08a2665ad03c80a0408667f8864f1ecd':
Improve bad error reporting seen in shamu SELinux boot failures.
Diffstat (limited to 'fs_mgr')
| -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 eb10642..5f639b7 100644 --- a/fs_mgr/fs_mgr.c +++ b/fs_mgr/fs_mgr.c @@ -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)); |