!1275 修复 cfg文件解析 有重复service 配置情况下优先级的问题

Merge pull request !1275 from cheng_jinsong/initsf0921

services/init/init_service_manager.c

@@ -990,14 +990,14 @@ void ParseAllServices(const cJSON *fileRoot)
             continue;
         }
         Service *service = GetServiceByName(fieldStr);
-        if (service != NULL) {
-            INIT_LOGE("Service \' %s \' already exist", fieldStr);
-            continue;
-        }
-        service = AddService(fieldStr);
         if (service == NULL) {
-            INIT_LOGE("Failed to create service name %s", fieldStr);
-            continue;
+            service = AddService(fieldStr);
+            if (service == NULL) {
+                INIT_LOGE("Failed to add service name %s", fieldStr);
+                continue;
+            }
+        } else {
+            INIT_LOGI("Service %s already exists, updating.", fieldStr);
         }
         service->pid = -1;
         int ret = ParseOneService(curItem, service);

services/init/standard/init.c

@@ -218,15 +218,15 @@ static void StartInitSecondStage(void)
 
 void SystemPrepare(void)
 {
-    INIT_LOGI("Start init first stage.");
     MountBasicFs();
     CreateDeviceNode();
     LogInit();
     // Make sure init log always output to /dev/kmsg.
     EnableDevKmsg();
+    INIT_LOGI("Start init first stage.");
     // Only ohos normal system support
     // two stages of init.
-    // If we are in updater mode, only one stage of init,
+    // If we are in updater mode, only one stage of init.
     if (InUpdaterMode() == 0) {
         StartInitSecondStage();
     }