提交 25efa2eb 编写于 作者: X xionglei6

fix:修改init_agent的目录权限

修改init_agent的目录权限
解决trigger check问题
Signed-off-by: Nxionglei6 <xionglei6@huawei.com>
上级 424c315d
...@@ -311,7 +311,7 @@ ...@@ -311,7 +311,7 @@
"mkdir /data/cache/recovery 0770 system cache", "mkdir /data/cache/recovery 0770 system cache",
"mkdir /data/cache/backup_stage 0700 system system", "mkdir /data/cache/backup_stage 0700 system system",
"mkdir /data/cache/backup 0700 system system", "mkdir /data/cache/backup 0700 system system",
"mkdir /data/init_agent 0776 system system", "mkdir /data/init_agent 0771 shell system",
"setparam sys.use_memfd false", "setparam sys.use_memfd false",
"chown root system /dev/fscklogs/log", "chown root system /dev/fscklogs/log",
"chmod 0770 /dev/fscklogs/log" "chmod 0770 /dev/fscklogs/log"
......
...@@ -305,7 +305,7 @@ ...@@ -305,7 +305,7 @@
"mkdir /data/cache/recovery 0770 system cache", "mkdir /data/cache/recovery 0770 system cache",
"mkdir /data/cache/backup_stage 0700 system system", "mkdir /data/cache/backup_stage 0700 system system",
"mkdir /data/cache/backup 0700 system system", "mkdir /data/cache/backup 0700 system system",
"mkdir /data/init_agent 0776 shell shell", "mkdir /data/init_agent 0771 shell system",
"setparam sys.use_memfd false", "setparam sys.use_memfd false",
"chown root system /dev/fscklogs/log", "chown root system /dev/fscklogs/log",
"chmod 0770 /dev/fscklogs/log" "chmod 0770 /dev/fscklogs/log"
......
...@@ -376,6 +376,9 @@ static int CheckParamCondition_(LogicCalculator *calculator, ...@@ -376,6 +376,9 @@ static int CheckParamCondition_(LogicCalculator *calculator,
static int CheckUnknowCondition_(LogicCalculator *calculator, static int CheckUnknowCondition_(LogicCalculator *calculator,
const char *condition, const char *content, uint32_t contentSize) const char *condition, const char *content, uint32_t contentSize)
{ {
if (condition != NULL && content != NULL && strcmp(content, condition) == 0) {
return 1;
}
return ComputeCondition(calculator, condition); return ComputeCondition(calculator, condition);
} }
......
...@@ -80,7 +80,7 @@ static void StartTiggerExecute_(TriggerNode *trigger, const char *content, uint3 ...@@ -80,7 +80,7 @@ static void StartTiggerExecute_(TriggerNode *trigger, const char *content, uint3
GetTriggerName(trigger), trigger->flags); GetTriggerName(trigger), trigger->flags);
triggerHead->executeTrigger(trigger, content, size); triggerHead->executeTrigger(trigger, content, size);
TRIGGER_CLEAR_FLAG(trigger, TRIGGER_FLAGS_QUEUE); TRIGGER_CLEAR_FLAG(trigger, TRIGGER_FLAGS_QUEUE);
if (TRIGGER_TEST_FLAG(trigger, TRIGGER_FLAGS_SUBTRIGGER)) { // boot:xxx=xxx trigger if (TRIGGER_TEST_FLAG(trigger, TRIGGER_FLAGS_SUBTRIGGER)) { // boot && xxx=xxx trigger
const char *condition = triggerHead->getCondition(trigger); const char *condition = triggerHead->getCondition(trigger);
CheckTrigger(&g_triggerWorkSpace, TRIGGER_UNKNOW, condition, strlen(condition), ExecuteTiggerImmediately); CheckTrigger(&g_triggerWorkSpace, TRIGGER_UNKNOW, condition, strlen(condition), ExecuteTiggerImmediately);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册