diff options
| author | Elliott Hughes <enh@google.com> | 2015-04-24 18:58:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-24 18:58:21 +0000 |
| commit | 92f075aa08a2665ad03c80a0408667f8864f1ecd (patch) | |
| tree | 71e2e002e3fa9a1a9090922acd3bcdd47ff90b1c /fs_mgr | |
| parent | 17560f8884a01f12ac3bea15246d10c4eea19638 (diff) | |
| parent | 48ba758782bed8c50f450fd77c4b3284c3fa7316 (diff) | |
| download | system_core-92f075aa08a2665ad03c80a0408667f8864f1ecd.tar.gz system_core-92f075aa08a2665ad03c80a0408667f8864f1ecd.tar.bz2 system_core-92f075aa08a2665ad03c80a0408667f8864f1ecd.zip | |
am 48ba7587: am 34dd04db: Merge "Improve bad error reporting seen in shamu SELinux boot failures."
* commit '48ba758782bed8c50f450fd77c4b3284c3fa7316':
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 eb106429d..5f639b764 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)); |