openharmony/startup_init
1
0
Fork 0
mirror of https://gitee.com/openharmony/startup_init synced 2024-11-30 22:01:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

revert: dofsck check fstype

Browse Source 
Signed-off-by: j30053360 <jiangqianrong1@huawei.com>
This commit is contained in:
j30053360 2024-09-13 10:26:53 +08:00
parent 5abd2df49d
commit 928158edcc
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
interfaces/innerkits/fs_manager/fstab_mount.c
View File

@ -322,31 +322,19 @@ static int DoResizeF2fs(const char* device, const unsigned long long size, const
return ExecCommand(argc, argv); return ExecCommand(argc, argv);
} }
#define MAX_CMD_PARAM_NUM 10 static int DoFsckF2fs(const char* device)
#define MAX_BUFFER_LENGTH 20
static int DoFsckF2fs(const char* device, char* fsType)
{ {
char *file = "/system/bin/fsck.f2fs"; char *file = "/system/bin/fsck.f2fs";
char *cmd[MAX_CMD_PARAM_NUM] = {NULL};
char buf[MAX_BUFFER_LENGTH];
int idx = 0;
int ret = 0;
BEGET_ERROR_CHECK(access(file, F_OK) == 0, return -1, "fsck.f2fs is not exists."); BEGET_ERROR_CHECK(access(file, F_OK) == 0, return -1, "fsck.f2fs is not exists.");
cmd[idx++] = file; char *cmd[] = {
cmd[idx++] = "-p1"; file, "-p1", (char *)device, NULL
if (strcmp(fsType, "f2fs") != 0) { };
ret = snprintf_s(buf, MAX_BUFFER_LENGTH, MAX_BUFFER_LENGTH - 1, "--convert=%s", fsType);
BEGET_ERROR_CHECK(ret != -1, return -1, "Failed to build fstype");
cmd[idx++] = buf;
}
cmd[idx++] = (char *)device;
cmd[idx++] = NULL;
int argc = ARRAY_LENGTH(cmd); int argc = ARRAY_LENGTH(cmd);
char **argv = (char **)cmd; char **argv = (char **)cmd;
InitTimerControl(true); InitTimerControl(true);
ret = ExecCommand(argc, argv); int ret = ExecCommand(argc, argv);
InitTimerControl(false); InitTimerControl(false);
return ret; return ret;
} }
@ -542,7 +530,7 @@ int MountOneItem(FstabItem *item)
BEGET_LOGE("Failed to resize.f2fs dir %s , ret = %d", item->deviceName, ret); BEGET_LOGE("Failed to resize.f2fs dir %s , ret = %d", item->deviceName, ret);
} }
ret = DoFsckF2fs(item->deviceName, item->fsType); ret = DoFsckF2fs(item->deviceName);
if (ret != 0) { if (ret != 0) {
BEGET_LOGE("Failed to fsck.f2fs dir %s , ret = %d", item->deviceName, ret); BEGET_LOGE("Failed to fsck.f2fs dir %s , ret = %d", item->deviceName, ret);
} }