openharmony/startup_init
1
0
Fork 0
mirror of https://gitee.com/openharmony/startup_init synced 2025-03-03 01:56:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!1063 修改启动过程中优化导致vendor/userdata分区无法挂载问题

Browse Source 
Merge pull request !1063 from OSWare/master
This commit is contained in:
openharmony_ci 2022-08-12 01:18:16 +00:00 committed by Gitee
commit 65312a7d57
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ueventd/ueventd.c
View File

@ -167,21 +167,13 @@ static void HandleRequiredDynamicDeviceNodes(const struct Uevent *uevent)
static void HandleRequiredBlockDeviceNodes(const struct Uevent *uevent, char **devices, int num)
{
const char *deviceName;
for (int i = 0; i < num; i++) {
if (uevent->partitionName == NULL) {
deviceName = strstr(devices[i], "/dev/block");
if (deviceName == NULL) {
INIT_LOGI("device %s not match \"/dev/block\"", devices[i]);
continue;
if (strstr(devices[i], uevent->deviceName) != NULL) {
INIT_LOGI("%s match with required partition %s success, now handle it", devices[i], uevent->deviceName);
HandleBlockDeviceEvent(uevent);
return;
}
deviceName += strlen("/dev/block");
if (strstr(uevent->syspath, deviceName) == NULL) {
continue;
}
INIT_LOGI("%s match with required partition %s success, now handle it", uevent->syspath, deviceName);
HandleBlockDeviceEvent(uevent);
return;
} else if (strstr(devices[i], uevent->partitionName) != NULL ||
strstr(uevent->partitionName, "vendor") != NULL || strstr(uevent->partitionName, "system") != NULL) {
INIT_LOGI("Handle required partitionName %s", uevent->partitionName);