diff options
| author | Ken Sumrall <ksumrall@android.com> | 2013-09-23 18:59:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-23 18:59:39 -0700 |
| commit | dfcbf02bb0a6705e3714a59e42e052fbb0ce8799 (patch) | |
| tree | 6b7e8a65c719d3b86e9c9b6b924d8b42b43b7bef /fs_mgr | |
| parent | 12d71925862c9268a06c4a9bbf0904f22e1c5323 (diff) | |
| parent | 6b1a027239689a817aa5ca44a2bcbfe48ed21408 (diff) | |
| download | system_core-dfcbf02bb0a6705e3714a59e42e052fbb0ce8799.tar.gz system_core-dfcbf02bb0a6705e3714a59e42e052fbb0ce8799.tar.bz2 system_core-dfcbf02bb0a6705e3714a59e42e052fbb0ce8799.zip | |
am 6b1a0272: Merge "Create a separate copy of the fsck logs" into klp-dev
* commit '6b1a027239689a817aa5ca44a2bcbfe48ed21408':
Create a separate copy of the fsck logs
Diffstat (limited to 'fs_mgr')
| -rw-r--r-- | fs_mgr/fs_mgr.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c index a4ef7dcd3..81ae7035f 100644 --- a/fs_mgr/fs_mgr.c +++ b/fs_mgr/fs_mgr.c @@ -53,6 +53,8 @@ #define E2FSCK_BIN "/system/bin/e2fsck" #define MKSWAP_BIN "/system/bin/mkswap" +#define FSCK_LOG_FILE "/dev/fscklogs/log" + #define ZRAM_CONF_DEV "/sys/block/zram0/disksize" #define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a))) @@ -430,7 +432,8 @@ static void check_fs(char *blk_device, char *fs_type, char *target) INFO("Running %s on %s\n", E2FSCK_BIN, blk_device); ret = android_fork_execvp_ext(ARRAY_SIZE(e2fsck_argv), e2fsck_argv, - &status, true, LOG_KLOG, true); + &status, true, LOG_KLOG | LOG_FILE, + true, FSCK_LOG_FILE); if (ret < 0) { /* No need to check for error in fork, we can't really handle it now */ @@ -747,7 +750,7 @@ int fs_mgr_swapon_all(struct fstab *fstab) /* Initialize the swap area */ mkswap_argv[1] = fstab->recs[i].blk_device; err = android_fork_execvp_ext(ARRAY_SIZE(mkswap_argv), mkswap_argv, - &status, true, LOG_KLOG, false); + &status, true, LOG_KLOG, false, NULL); if (err) { ERROR("mkswap failed for %s\n", fstab->recs[i].blk_device); ret = -1; |